X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=b3b2c4dd28c4f1a8f14948e5d1262dd71f1e96cf;hb=be65e7d9fbd3ae6fc097cedade2afe39805fcf4e;hp=7150b90385952373f4fd49eb073d819541cc306d;hpb=bd346f105dc6f343eb577e4b25dbc1fa098cff33;p=git.git

diff --git a/diff.h b/diff.h
index 7150b903..b3b2c4dd 100644
--- a/diff.h
+++ b/diff.h
@@ -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 *,