merge-recursive: make "Auto-merging" comment show for other merges

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index 6bd278aac11a4349ce76602113e45e31ae1229de..d29560f822ca0ee4738f769e2feb3939851d7ff1 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -93,6 +93,7 @@ struct diff_flags {
        unsigned dirstat_by_line:1;
        unsigned funccontext:1;
        unsigned default_follow_renames:1;
+       unsigned stat_with_summary:1;
 };
 
 static inline void diff_flags_or(struct diff_flags *a,