diff options
author | Timo Hirvonen <tihirvon@gmail.com> | 2006-06-24 21:21:53 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-27 01:58:40 +0400 |
commit | c6744349df5089133b7662e67aba28282b6a963f (patch) | |
tree | 28d3ce776203fef4c445fa03b68fb2257eeb1799 /builtin-diff.c | |
parent | 1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (diff) |
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>
Diffstat (limited to 'builtin-diff.c')
-rw-r--r-- | builtin-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index 99a2f766055..3b44296ff40 100644 --- 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 |