Merge branch 'tb/precompose-prefix-too'

[thirdparty/git.git] / builtin / diff-files.c

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index e3851dd1c02ed6c3830bac5816f81b5c33e1e4c7..bb852661020121895abbe3b6d9ae9c164b7244b9 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -7,6 +7,7 @@
 #include "cache.h"
 #include "config.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "commit.h"
 #include "revision.h"
 #include "builtin.h"
@@ -69,9 +70,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
         * 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 &&
+       if (rev.max_count == -1 &&
            (rev.diffopt.output_format & DIFF_FORMAT_PATCH))
-               rev.combine_merges = rev.dense_combined_merges = 1;
+               diff_merges_set_dense_combined_if_unset(&rev);
 
        if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
                perror("read_cache_preload");