diff options
Diffstat (limited to 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 58e4731..9d75ed4 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -39,7 +39,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) XDL_MERGE_FAVOR_UNION), OPT_INTEGER(0, "marker-size", &xmp.marker_size, "for conflicts, use this marker size"), - OPT__QUIET(&quiet, "be quiet"), + OPT__QUIET(&quiet, "do not warn about conflicts"), OPT_CALLBACK('L', NULL, names, "name", "set labels for file1/orig_file/file2", &label_cb), OPT_END(), |