From d5d6656c52ec5af53ce55a9f0b9478c4eec3d90d Mon Sep 17 00:00:00 2001
From: Seongmin Lee <git@boltless.me>
Date: Mon, 21 Sep 2026 18:53:14 +0900
Subject: [PATCH] knot2: restore merge route

I have no idea why I committed this.
It will be deprecated in 1.0, but not yet.

Signed-off-by: Seongmin Lee <git@boltless.me>
---
 knot2/crates/knot-xrpc/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/knot2/crates/knot-xrpc/src/lib.rs b/knot2/crates/knot-xrpc/src/lib.rs
index 4e39491c6..c3c475e7c 100644
--- a/knot2/crates/knot-xrpc/src/lib.rs
+++ b/knot2/crates/knot-xrpc/src/lib.rs
@@ -316,7 +316,7 @@ impl<S: Send + Sync> FromRequestParts<S> for Method {
 
 pub fn router<H: HttpTransport, C: Clock>(state: Arc<XrpcState<H, C>>) -> Router {
     let merge_routes = Router::new()
-        // .route(merge::MERGE_ROUTE, post(merge::merge::<H, C>))
+        .route(merge::MERGE_ROUTE, post(merge::merge::<H, C>))
         .route(merge::MERGE_CHECK_ROUTE, post(merge::merge_check::<H, C>))
         .layer(DefaultBodyLimit::max(state.byte_limits.patch.get()));
     Router::new()
-- 
2.51.2