summaryrefslogtreecommitdiff
path: root/diff-merges.h
diff options
context:
space:
mode:
Diffstat (limited to 'diff-merges.h')
-rw-r--r--diff-merges.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-merges.h b/diff-merges.h
index 243ef915c4..a031240576 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -13,6 +13,8 @@ void diff_merges_init_revs(struct rev_info *revs);
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
+void diff_merges_suppress(struct rev_info *revs);
+
void diff_merges_default_to_first_parent(struct rev_info *revs);
void diff_merges_default_to_dense_combined(struct rev_info *revs);