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

diff --git a/diff.h b/diff.h
index c3486ffa8618c1b2478c7c7197399bc47af0cbf0..ab0d47b982ac462843f6fbde555ea902f332b97d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -56,6 +56,8 @@ 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, int);
+
 extern void diff_addremove(struct diff_options *,
                           int addremove,
                           unsigned mode,
@@ -103,7 +105,7 @@ extern void diffcore_std_no_resolve(struct diff_options *);
 "  --name-only   show only names of changed files.\n" \
 "  --name-status show names and status of changed files.\n" \
 "  --full-index  show full object name on index lines.\n" \
-"  --abbrev      abbreviate object names in diff-tree header and diff-raw.\n" \
+"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 "  -R            swap input file pairs.\n" \
 "  -B            detect complete rewrites.\n" \
 "  -M            detect renames.\n" \