Merge branch 'jc/diff-prefix'

* jc/diff-prefix:
  diff: vary default prefix depending on what are compared

1 files changed, 2 insertions, 0 deletions

diff --git a/diff.h b/diff.h
index 7f53bebf33..1ca4f46284 100644
--- 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,