X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=7db5ce6407b9755e42445a7cf43d6dc5615bf3e7;hb=0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1;hp=d24d11c28dbc2996a352c7adacef0d96cfad5fe6;hpb=5b23683251801381a17b5c3e82940c268821681c;p=git.git

diff --git a/diff-files.c b/diff-files.c
index d24d11c2..7db5ce64 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -88,9 +88,8 @@ int main(int argc, const char **argv)
 		}
 		argv++; argc--;
 	}
-	if (combine_merges) {
+	if (dense_combined_merges)
 		diff_options.output_format = DIFF_FORMAT_PATCH;
-	}
 
 	/* Find the directory, and set up the pathspec */
 	pathspec = get_pathspec(prefix, argv + 1);
@@ -166,7 +165,8 @@ int main(int argc, const char **argv)
 			if (combine_merges && num_compare_stages == 2) {
 				show_combined_diff(&combine.p, 2,
 						   dense_combined_merges,
-						   NULL);
+						   NULL,
+						   &diff_options);
 				free(combine.p.path);
 				continue;
 			}