commit c6744349df5089133b7662e67aba28282b6a963f
author Timo Hirvonen <tihirvon@gmail.com> Sat Jun 24 20:21:53 2006 +0300
committer Junio C Hamano <junkio@cox.net> Mon Jun 26 14:58:40 2006 -0700
tree 28d3ce776203fef4c445fa03b68fb2257eeb1799
parent 1ef9e05dbf36a80bb65fb150dd7bdd60852db777

Merge with_raw, with_stat and summary variables to output_format

DIFF_FORMAT_* are now bit-flags instead of enumerated values.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

builtin-diff.c

diff --git a/builtin-diff.c b/builtin-diff.c
index 99a2f76..3b44296 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -56,7 +56,7 @@
 	    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