patch (2.6.1-3) m-merge

Summary


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

download this patch

Patch contents

--- a/src/patch.c
+++ b/src/patch.c
@@ -524,7 +524,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";

page code/design/content is copyright (c) 2008 sean finney <seanius@debian.org>.
patches viewed/retrieved through this system are copyrighted by their respective authors.
browse git repo - clone git repo