X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=f9c7d15f56ded660e8cc58ca533786fff16c5429;hb=e1cbc46d12a0524fd5e710cbfaf3f178fc3da504;hp=113dd5a89fc03ff17b04443f2ac7148b4c36af33;hpb=4262c1b0c38613a8c5ae729bd4d3f18f0df3ec44;p=git.git

diff --git a/revision.c b/revision.c
index 113dd5a8..f9c7d15f 100644
--- a/revision.c
+++ b/revision.c
@@ -789,7 +789,8 @@ 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)
+		if (revs->dense_combined_merges &&
+		    (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
 			revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 	}
 	revs->diffopt.abbrev = revs->abbrev;