4 struct unpack_trees_options;
6 typedef int (*merge_fn_t)(struct cache_entry **src,
7 struct unpack_trees_options *options);
9 struct unpack_trees_options {
15 int trivial_merges_only;
22 struct dir_struct *dir;
28 struct cache_entry *df_conflict_entry;
31 struct index_state *dst_index;
32 const struct index_state *src_index;
33 struct index_state result;
36 extern int unpack_trees(unsigned n, struct tree_desc *t,
37 struct unpack_trees_options *options);
39 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
40 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
41 int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
42 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);