X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=d052608404314880652561e4296e05e9da3f96ca;hb=e6ebb8a3fbef10f50a3f4fe346d3bb47fe8ce07b;hp=7150b90385952373f4fd49eb073d819541cc306d;hpb=3d990f110c2e5b8df83f6ab3ef83497f43c7fd47;p=git.git

diff --git a/diff.h b/diff.h
index 7150b903..d0526084 100644
--- a/diff.h
+++ b/diff.h
@@ -28,6 +28,7 @@ struct diff_options {
 		 with_raw:1,
 		 with_stat:1,
 		 tree_in_recursive:1,
+		 binary:1,
 		 full_index:1,
 		 silent_on_remove:1,
 		 find_copies_harder:1;
@@ -75,6 +76,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 *,