log: show merge commit when --cc is given

diff --git a/cache-tree.h b/cache-tree.h
index aa7b3e4a0a9d4bbb29574d71e23c05349be4c6fc..41c574663a14840aa726c46c19b071fa6555f0ef 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -46,6 +46,7 @@ int update_main_cache_tree(int);
 #define WRITE_TREE_UNMERGED_INDEX (-2)
 #define WRITE_TREE_PREFIX_ERROR (-3)
 
+int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
 int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix);
 void prime_cache_tree(struct index_state *, struct tree *);