diff options
Diffstat (limited to 'builtin-diff-files.c')
| -rw-r--r-- | builtin-diff-files.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 9bf10bb..2b578c7 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -50,7 +50,12 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) 3 < rev.max_count) usage(diff_files_usage); - if (rev.max_count == -1 && + /* + * "diff-files --base -p" should not combine merges because it + * was not asked to. "diff-files -c -p" should not densify + * (the user should ask with "diff-files --cc" explicitly). + */ + if (rev.max_count == -1 && !rev.combine_merges && (rev.diffopt.output_format & DIFF_FORMAT_PATCH)) rev.combine_merges = rev.dense_combined_merges = 1; |