4 #define MAX_UNPACK_TREES 8
6 struct unpack_trees_options;
9 typedef int (*merge_fn_t)(struct cache_entry **src,
10 struct unpack_trees_options *options);
12 struct unpack_trees_error_msgs {
13 const char *would_overwrite;
14 const char *not_uptodate_file;
15 const char *not_uptodate_dir;
16 const char *would_lose_untracked;
17 const char *bind_overlap;
18 const char *sparse_not_uptodate_file;
19 const char *would_lose_orphaned;
22 struct unpack_trees_options {
38 struct dir_struct *dir;
40 struct unpack_trees_error_msgs msgs;
45 struct cache_entry *df_conflict_entry;
48 struct index_state *dst_index;
49 struct index_state *src_index;
50 struct index_state result;
52 struct exclude_list *el; /* for internal use */
55 extern int unpack_trees(unsigned n, struct tree_desc *t,
56 struct unpack_trees_options *options);
58 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
59 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
60 int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
61 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);