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        int pos;
  20        struct dir_struct *dir;
  21        merge_fn_t fn;
  22
  23        int head_idx;
  24        int merge_size;
  25
  26        struct cache_entry *df_conflict_entry;
  27};
  28
  29extern int unpack_trees(struct object_list *trees,
  30                struct unpack_trees_options *options);
  31
  32int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
  33int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
  34int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
  35int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
  36
  37#endif