diff-index: restore -c/--cc options handling

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

diff --git a/diff-merges.h b/diff-merges.h
index b5d57f6563e3ab8323e4091201aeb62b4a5530d1..19639689bb05f7b241f37a22ad16e83d1d0be8db 100644 (file)
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -11,7 +11,7 @@ struct rev_info;
 
 int diff_merges_config(const char *value);
 
-void diff_merges_suppress_options_parsing(void);
+void diff_merges_suppress_m_parsing(void);
 
 int diff_merges_parse_opts(struct rev_info *revs, const char **argv);