X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=191f7442f10683c8043288eece36f39166fedc95;hb=3358004a006714477c2c44577507081cb5124fa4;hp=38af89a6b79ec49d403e2791c0c5f73b52f79cba;hpb=16da134b1f9b0fbd1d328999875d34d02e5470b4;p=git.git

diff --git a/unpack-trees.h b/unpack-trees.h
index 38af89a6b..191f7442f 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,7 @@ struct unpack_trees_options {
 	int verbose_update;
 	int aggressive;
 	const char *prefix;
+	struct dir_struct *dir;
 	merge_fn_t fn;
 
 	int head_idx;
@@ -27,4 +28,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