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, 1 insertions, 1 deletions
diff --git a/diff-merges.h b/diff-merges.h
index b5d57f6563..19639689bb 100644
--- 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);