summaryrefslogtreecommitdiff
path: root/diff-merges.h
diff options
context:
space:
mode:
Diffstat (limited to 'diff-merges.h')
-rw-r--r--diff-merges.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/diff-merges.h b/diff-merges.h
index 659467c99a..b5d57f6563 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -9,6 +9,10 @@
struct rev_info;
+int diff_merges_config(const char *value);
+
+void diff_merges_suppress_options_parsing(void);
+
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
void diff_merges_suppress(struct rev_info *revs);