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 4ced909b79..6937d46219 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -17,7 +17,7 @@ void diff_merges_setup_revs(struct rev_info *revs);
void diff_merges_default_to_dense_combined(struct rev_info *revs);
-void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
+void diff_merges_default_to_enable(struct rev_info *revs);
#endif