diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-29 01:33:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-29 01:33:16 -0700 |
| commit | a0c5081a78bef2167d9663fe0847b757a6a797f5 (patch) | |
| tree | 0ab7a492faa0ddbfffe588c7bdcfe26e81f3a475 /diff.h | |
| parent | Merge branch 'np/delta' into next (diff) | |
| parent | built-in diff: assorted updates. (diff) | |
| download | tgif-a0c5081a78bef2167d9663fe0847b757a6a797f5.tar.xz | |
Merge branch 'jc/diff' into next
* jc/diff:
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 *, |