diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2013-12-09 09:26:16 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@linbit.com> | 2013-12-09 09:26:16 +0100 |
| commit | dc63883f08f6ff4f87e1192819a145450a66629c (patch) | |
| tree | ca5a7882984a666e4ceead21c698eb61b2cc7f28 | |
| parent | a2f4bfe0f3f54181a8f1077cde9ebef0b4f891c0 (diff) | |
| download | patch-dc63883f08f6ff4f87e1192819a145450a66629c.tar.gz | |
Correct the --help text of option --merge
* src/patch.c (option_help): The --merge option does not have a short
form; update the help text.
| -rw-r--r-- | src/patch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/patch.c b/src/patch.c index 2f46243..0ecfa6c 100644 --- a/src/patch.c +++ b/src/patch.c @@ -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.", "", |