builtin-diff.c: die() formatting type fix.

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index f2a9f25fe11f3883281ea5fdd783700056fd5c6e..4381d455e4579fb2c6c598cee5e9252277590b28 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -664,6 +664,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strcmp(arg, "-c")) {
                                revs->diff = 1;
+                               revs->dense_combined_merges = 0;
                                revs->combine_merges = 1;
                                continue;
                        }