diff --git a/unpack-trees.h b/unpack-trees.h
index 38af89a6b79ec49d403e2791c0c5f73b52f79cba..191f7442f10683c8043288eece36f39166fedc95 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
int verbose_update;
int aggressive;
const char *prefix;
+ struct dir_struct *dir;
merge_fn_t fn;
int head_idx;
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