Package: patch / 2.7.6-7

m-merge Patch series | download 
1
2
3
4
5
6
7
8
9
10
11
 
--- a/src/patch.c
+++ b/src/patch.c
@@ -684,7 +684,7 @@
 }
 
 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";