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;
20 struct dir_struct *dir;
26 struct cache_entry *df_conflict_entry;
29 extern int unpack_trees(struct object_list *trees,
30 struct unpack_trees_options *options);
32 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
33 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
34 int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
35 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);