Andrew's git - gitweb.git/blob

   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
   9struct unpack_trees_options {
  10        int reset;
  11        int merge;
  12        int update;
  13        int index_only;
  14        int nontrivial_merge;
  15        int trivial_merges_only;
  16        int verbose_update;
  17        int aggressive;
  18        const char *prefix;
  19        merge_fn_t fn;
  20
  21        int head_idx;
  22        int merge_size;
  23
  24        struct cache_entry *df_conflict_entry;
  25};
  26
  27extern int unpack_trees(struct object_list *trees,
  28                struct unpack_trees_options *options);
  29
  30int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
  31int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
  32int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
  33int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
  34
  35#endif