From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org>
Date: Sat, 14 May 2022 02:38:24 +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 0fe6d72..cb401ec 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -719,7 +719,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";
