diff --git a/diff-files.c b/diff-files.c
index d24d11c28dbc2996a352c7adacef0d96cfad5fe6..0c3f80046b51abd3c44da61a71dce7da3a712518 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
}
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);
nce->sha1, 20);
combine.p.parent[stage-2].mode =
DIFF_FILE_CANON_MODE(mode);
+ combine.p.parent[stage-2].status =
+ DIFF_STATUS_MODIFIED;
}
/* diff against the proper unmerged stage */
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;
}