X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-file.c;h=237abd3c0b27b601aca140bfb67a302666ff9cf2;hb=02f419efcbda05f9923306ae1fcdd754187563fa;hp=6c4afb5a38bc954be836c441b9b09b22ef82b132;hpb=eb4e67288bb9d66fb46092fa30d72c4bdded0c2a;p=git.git

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 6c4afb5a3..237abd3c0 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -40,7 +40,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),
+		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(),