X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=946a4067cc4c56cb5d4b79ff13e9aecb4d99b336;hb=0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1;hp=9088519af0dd29df4cefb1183f51e5970489c98e;hpb=5b23683251801381a17b5c3e82940c268821681c;p=git.git

diff --git a/diff.h b/diff.h
index 9088519a..946a4067 100644
--- a/diff.h
+++ b/diff.h
@@ -75,7 +75,8 @@ struct combine_diff_path {
 	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 
 extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
-			      int dense, const char *header);
+			      int dense, const char *header,
+			      struct diff_options *);
 
 extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);