Staging
v0.5.1
v0.5.1
Revision 7193db3685b71be3e93aaac785bdc554d91d2167 authored by Junio C Hamano on 05 March 2007, 01:20:38 UTC, committed by Junio C Hamano on 05 March 2007, 01:20:38 UTC
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 2aa54fa
unpack-trees.h
#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H
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;
const char *prefix;
struct dir_struct *dir;
merge_fn_t fn;
int head_idx;
int merge_size;
struct cache_entry *df_conflict_entry;
};
extern int unpack_trees(struct object_list *trees,
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
Computing file changes ...