combine-diff: move formatting logic to show_combined_diff()

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index df6fd97..b170b03 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -248,7 +248,7 @@ int main(int argc, const char **argv)
                        continue;
                }
                if (!strcmp(arg, "-m")) {
-                       ignore_merges = 0;
+                       combine_merges = ignore_merges = 0;
                        continue;
                }
                if (!strcmp(arg, "-c")) {