Merge branch 'js/merge-base'

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index b4157cbb6de7dba184ff1ca9a558769338154a0b..a7750e626b63815cb0a579287220b289af7311b3 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -883,8 +883,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
        }
        if (revs->combine_merges) {
                revs->ignore_merges = 0;
-               if (revs->dense_combined_merges &&
-                   (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
+               if (revs->dense_combined_merges && !revs->diffopt.output_format)
                        revs->diffopt.output_format = DIFF_FORMAT_PATCH;
        }
        revs->diffopt.abbrev = revs->abbrev;