Merge with_raw, with_stat and summary variables to output_format

diff --git a/builtin-diff.c b/builtin-diff.c
index 99a2f766055d6c8c3231e38bd369169d3c742782..3b44296ff403d6b8928e147e781948645068fb02 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -56,7 +56,7 @@ static int builtin_diff_files(struct rev_info *revs,
            3 < revs->max_count)
                usage(builtin_diff_usage);
        if (revs->max_count < 0 &&
-           (revs->diffopt.output_format == DIFF_FORMAT_PATCH))
+           (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
                revs->combine_merges = revs->dense_combined_merges = 1;
        /*
         * Backward compatibility wart - "diff-files -s" used to