Merge branch 'maint'

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 7f53bebf335148a5f623b5fcbe6142e6c4b53282..1ca4f4628473c940fa0399b23f8da5c92a424dd5 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -160,6 +160,8 @@ extern void diff_tree_combined(const unsigned char *sha1, const unsigned char pa
 
 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 
+void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
+
 extern void diff_addremove(struct diff_options *,
                           int addremove,
                           unsigned mode,