Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/unpack-trees.h b/unpack-trees.h
index 38af89a6b79ec49d403e2791c0c5f73b52f79cba..fee7da43822b63e5b1f24444e5c51c43d3ff5760 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,8 @@ struct unpack_trees_options {
        int verbose_update;
        int aggressive;
        const char *prefix;
+       int pos;
+       struct dir_struct *dir;
        merge_fn_t fn;
 
        int head_idx;
@@ -27,4 +29,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