X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=52fff6643ffe375e18cab6c8a3af6d5c11c8cd6d;hb=9153983310a169a340bd1023dccafd80b70b05bc;hp=f783baef14604678d1e638cc766bffdbdc43f691;hpb=db89665fbf86d4e0166b2f252a939ed8bf6782fe;p=git.git

diff --git a/diff.h b/diff.h
index f783baef..52fff664 100644
--- a/diff.h
+++ b/diff.h
@@ -6,6 +6,7 @@
 
 #include "tree-walk.h"
 
+struct rev_info;
 struct diff_options;
 
 typedef void (*change_fn_t)(struct diff_options *options,
@@ -70,11 +71,10 @@ struct combine_diff_path {
 	(sizeof(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,
-			      struct diff_options *);
+extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
+			      int dense, struct rev_info *);
 
-extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
+extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 
 extern void diff_addremove(struct diff_options *,
 			   int addremove,