combine-diff: move formatting logic to show_combined_diff()

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 9088519..946a406 100644 (file)
--- 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);