combine-diff: extend --cc logic to Octopus.

diff --git a/diff.h b/diff.h
index 081234cb97ce1a06c7acda97510dc8440d440a86..ab0d47b982ac462843f6fbde555ea902f332b97d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -56,7 +56,7 @@ extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
                          const char *base, struct diff_options *opt);
 
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
+extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
 
 extern void diff_addremove(struct diff_options *,
                           int addremove,