4 struct unpack_trees_options;
6 typedef int (*merge_fn_t)(struct cache_entry **src,
7 struct unpack_trees_options *options,
10 struct unpack_trees_options {
16 int trivial_merges_only;
21 struct dir_struct *dir;
27 struct cache_entry *df_conflict_entry;
31 extern int unpack_trees(unsigned n, struct tree_desc *t,
32 struct unpack_trees_options *options);
34 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o, int);
35 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
36 int bind_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
37 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);