xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 5b4f020e38d3f97e05c1d8b1c465e8fcc2a7b851..1e92510026b552d521c178813f50f4358039e98f 100644 (file)
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -27,10 +27,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
                else if (!strcmp(argv[1], "-q") ||
                                !strcmp(argv[1], "--quiet"))
                        freopen("/dev/null", "w", stderr);
-               else if (!strcmp(argv[1], "--diff3")) {
+               else if (!strcmp(argv[1], "--diff3"))
                        merge_style = XDL_MERGE_DIFF3;
-                       merge_level = XDL_MERGE_EAGER;
-               }
                else
                        usage(merge_file_usage);
                argc--;