4 #define MAX_UNPACK_TREES 8
6 struct unpack_trees_options;
8 typedef int (*merge_fn_t)(struct cache_entry **src,
9 struct unpack_trees_options *options);
11 struct unpack_trees_options {
17 int trivial_merges_only;
24 struct dir_struct *dir;
30 struct cache_entry *df_conflict_entry;
33 struct index_state *dst_index;
34 const struct index_state *src_index;
35 struct index_state result;
38 extern int unpack_trees(unsigned n, struct tree_desc *t,
39 struct unpack_trees_options *options);
41 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
42 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
43 int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
44 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);