You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
1016 B
21 lines
1016 B
6 years ago
|
diff -up patch-2.7.1/src/patch.c.args patch-2.7.1/src/patch.c
|
||
|
|
--- patch-2.7.1/src/patch.c.args 2013-04-11 11:30:52.644026499 +0100
|
||
|
|
+++ patch-2.7.1/src/patch.c 2013-04-11 11:31:54.990246532 +0100
|
||
|
|
@@ -762,7 +762,7 @@ static char const *const option_help[] =
|
||
|
|
"",
|
||
|
|
" -D NAME --ifdef=NAME Make merged if-then-else output using NAME.",
|
||
|
|
#ifdef ENABLE_MERGE
|
||
|
|
-" -m --merge Merge using conflict markers instead of creating reject files.",
|
||
|
|
+" --merge Merge using conflict markers instead of creating reject files.",
|
||
|
|
#endif
|
||
|
|
" -E --remove-empty-files Remove output files that are empty after patching.",
|
||
|
|
"",
|
||
|
|
@@ -801,6 +801,7 @@ static char const *const option_help[] =
|
||
|
|
" --binary Read and write data in binary mode.",
|
||
|
|
" --read-only=BEHAVIOR How to handle read-only input files: 'ignore' that they",
|
||
|
|
" are read-only, 'warn' (default), or 'fail'.",
|
||
|
|
+" -x NUM --debug=NUM Set internal debugging flags.",
|
||
|
|
"",
|
||
|
|
" -v --version Output version info.",
|
||
|
|
" --help Output this help.",
|