Merge branch 'jc/diff-prefix'

* jc/diff-prefix: diff: vary default prefix depending on what are compared
2008-09-18 20:30:07 -07:00
parent c4398286fa a5a818ee48
commit e69a6f47c4
7 changed files with 70 additions and 8 deletions
--- 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,