Merge branch 'rr/cvsexportcommit'

diff --git a/unpack-trees.h b/unpack-trees.h
index 38af89a6b79ec49d403e2791c0c5f73b52f79cba..c4601621cd71ac6e750c90bd3ac4b426d8e12369 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -27,4 +27,9 @@ struct unpack_trees_options {
 extern int unpack_trees(struct object_list *trees,
                struct unpack_trees_options *options);
 
+int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
+int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
+int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
+int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
+
 #endif