1#ifndef UNPACK_TREES_H
2#define UNPACK_TREES_H
3
4struct unpack_trees_options;
5
6typedef int (*merge_fn_t)(struct cache_entry **src,
7 struct unpack_trees_options *options,
8 int remove);
9
10struct unpack_trees_options {
11 int reset;
12 int merge;
13 int update;
14 int index_only;
15 int nontrivial_merge;
16 int trivial_merges_only;
17 int verbose_update;
18 int aggressive;
19 int gently;
20 const char *prefix;
21 int pos;
22 struct dir_struct *dir;
23 merge_fn_t fn;
24
25 int head_idx;
26 int merge_size;
27
28 struct cache_entry *df_conflict_entry;
29 void *unpack_data;
30};
31
32extern int unpack_trees(unsigned n, struct tree_desc *t,
33 struct unpack_trees_options *options);
34
35int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o, int);
36int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
37int bind_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
38int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o, int);
39
40#endif