diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-08 10:03:37 +1200 |
|---|---|---|
| committer | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-08 10:03:37 +1200 |
| commit | 50c08d48722149d95f46bcc80a5211ea04b8a809 (patch) | |
| tree | 15c465be37ba4fdd8824edb95085b81076b73af9 /diff.h | |
| parent | a248c9614fdd130229fb5f9565abbd77bd1d0cc9 (diff) | |
| parent | be65e7d9fbd3ae6fc097cedade2afe39805fcf4e (diff) | |
| download | git-50c08d48722149d95f46bcc80a5211ea04b8a809.tar.gz | |
Merge with git://kernel.org/pub/scm/git/git.git
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 *, |