X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=96085cbb0f71cdc8e21940130db95ebf5366683f;hb=0041f09de6e62efc31c860487f04e8b08bce68c8;hp=0c51724493f76461b67d6ef8f5556852819ad809;hpb=ee228024933069b93ce23a1bd5eeb7ae12c792f2;p=git.git

diff --git a/diff.h b/diff.h
index 0c5172449..96085cbb0 100644
--- a/diff.h
+++ b/diff.h
@@ -12,6 +12,7 @@ struct diff_queue_struct;
 struct strbuf;
 struct diff_filespec;
 struct userdiff_driver;
+struct sha1_array;
 
 typedef void (*change_fn_t)(struct diff_options *options,
 		 unsigned old_mode, unsigned new_mode,
@@ -195,7 +196,7 @@ 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(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev);
 
 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);