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
;
20 struct unpack_trees_options
{
36 struct dir_struct
*dir
;
38 struct unpack_trees_error_msgs msgs
;
43 struct cache_entry
*df_conflict_entry
;
46 struct index_state
*dst_index
;
47 struct index_state
*src_index
;
48 struct index_state result
;
50 struct exclude_list
*el
; /* for internal use */
53 extern int unpack_trees(unsigned n
, struct tree_desc
*t
,
54 struct unpack_trees_options
*options
);
56 int threeway_merge(struct cache_entry
**stages
, struct unpack_trees_options
*o
);
57 int twoway_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
);
58 int bind_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
);
59 int oneway_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
);