usage: report vsnprintf(3) failure

[thirdparty/git.git] / diff-merges.h

diff --git a/diff-merges.h b/diff-merges.h
index 659467c99a4f1cbde781c633af7a87ecc287a435..19639689bb05f7b241f37a22ad16e83d1d0be8db 100644 (file)
--- 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_m_parsing(void);
+
 int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
 
 void diff_merges_suppress(struct rev_info *revs);