File: m-merge

package info (click to toggle)
patch 2.7.5-1%2Bdeb8u1
  • links: PTS, VCS
  • area: main
  • in suites: jessie
  • size: 6,092 kB
  • sloc: ansic: 35,784; sh: 6,094; yacc: 1,254; makefile: 181; sed: 54
file content (11 lines) | stat: -rw-r--r-- 221 bytes parent folder | download | duplicates (5) 
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";