diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-03 23:54:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-03 23:54:34 -0700 |
| commit | 230f544e877641666f8c3718ac4563294c2b305e (patch) | |
| tree | ae2c574c6c8384b7b379aff52c035a7b953ff084 /diff.h | |
| parent | 6b16250a4551682b026b2592e44077ffa5fbdf2a (diff) | |
| parent | 8ab99476ec2298a43e94949e0bb7aa5125793a28 (diff) | |
| download | git-230f544e877641666f8c3718ac4563294c2b305e.tar.gz git-230f544e877641666f8c3718ac4563294c2b305e.tar.xz | |
Merge branch 'jc/diff'
* jc/diff:
builtin-diff: call it "git-diff", really.
builtin-diff.c: die() formatting type fix.
built-in diff: assorted updates.
built-in diff.
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -75,6 +75,8 @@ struct combine_diff_path { extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, int dense, struct rev_info *); +extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev); + extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *); extern void diff_addremove(struct diff_options *, |