#ifndef UNPACK_TREES_H #define UNPACK_TREES_H #define MAX_UNPACK_TREES 8 struct unpack_trees_options; typedef int (*merge_fn_t)(struct cache_entry **src, struct unpack_trees_options *options); struct unpack_trees_options { int reset; int merge; int update; int index_only; int nontrivial_merge; int trivial_merges_only; int verbose_update; int aggressive; int skip_unmerged; int gently; const char *prefix; int pos; struct dir_struct *dir; merge_fn_t fn; int head_idx; int merge_size; struct cache_entry *df_conflict_entry; void *unpack_data; struct index_state *dst_index; const struct index_state *src_index; struct index_state result; }; extern int unpack_trees(unsigned n, struct tree_desc *t, struct unpack_trees_options *options); int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o); int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o); int bind_merge(struct cache_entry **src, struct unpack_trees_options *o); int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o); #endif