From: openKylin Developers <packaging@lists.openkylin.top>
Date: Thu, 4 Jun 2026 14:00:07 +0800
Subject: m-merge

---
 src/patch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/patch.c b/src/patch.c
index e4d0524..225d3db 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -750,7 +750,7 @@ reinitialize_almost_everything (void)
 }
 
 static char const shortopts[] = "bB:cd:D:eEfF:g:i:l"
-#if 0 && defined ENABLE_MERGE
+#if defined ENABLE_MERGE
 				"m"
 #endif
 				"nNo:p:r:RstTuvV:x:Y:z:Z";
