diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-11-08 13:54:48 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 10:04:56 -0800 |
| commit | 8c83968385e1e742e188435fd2fe5ebf57565e49 (patch) | |
| tree | 128fbce77c06fd198b323bdf6721e321abcab02f /builtin/merge-file.c | |
| parent | 76946b76fe3d26507d61cae97aa0676fad24ed92 (diff) | |
| download | git-8c83968385e1e742e188435fd2fe5ebf57565e49.tar.gz | |
Describe various forms of "be quiet" using OPT__QUIET
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 58e473141c..9d75ed42c2 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(), |