tests: remove last uses of C_LOCALE_OUTPUT

[thirdparty/git.git] / diff-merges.c

diff --git a/diff-merges.c b/diff-merges.c
index 011bfff1f1350198a7867f70f1da4d68415e053c..146bb50316a6808e381610dc7168a3b7cf638275 100644 (file)
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -58,7 +58,7 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
                return;
        }
 
-       if (!strcmp(optarg, "first-parent"))
+       if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
                set_first_parent(revs);
        else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
                set_separate(revs);