File: m-merge

package info (click to toggle)
patch 2.8-2
  • links: PTS
  • area: main
  • in suites: forky, sid, trixie
  • size: 7,888 kB
  • sloc: ansic: 41,776; sh: 7,300; yacc: 1,858; makefile: 143; sed: 54
file content (11 lines) | stat: -rw-r--r-- 221 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
 
--- a/src/patch.c
+++ b/src/patch.c
@@ -750,7 +750,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";