summaryrefslogtreecommitdiff
path: root/src/patch.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/patch.c')
-rw-r--r--src/patch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/patch.c b/src/patch.c
index 652db31..9e94823 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -622,7 +622,7 @@ reinitialize_almost_everything (void)
}
static char const shortopts[] = "bB:cd:D:eEfF:g:i:l"
-#if 0 && defined(ENABLE_MERGE)
+#if 0 && defined ENABLE_MERGE
"m"
#endif
"nNo:p:r:RstTuvV:x:Y:z:Z";