diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-19 05:30:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-19 05:30:07 +0200 |
| commit | e69a6f47c4e25a20170eb989a55257d0399f795b (patch) | |
| tree | 4891b8d55a9d188ad695c7da5c35c3744d1909b6 /diff.h | |
| parent | Merge branch 'np/pack' (diff) | |
| parent | diff: vary default prefix depending on what are compared (diff) | |
| download | git-e69a6f47c4e25a20170eb989a55257d0399f795b.tar.xz git-e69a6f47c4e25a20170eb989a55257d0399f795b.zip | |
Merge branch 'jc/diff-prefix'
* jc/diff-prefix:
diff: vary default prefix depending on what are compared
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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, |