git@vger.kernel.org mailing list mirror (one of many)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
 #ifndef MERGE_STRATEGIES_H
#define MERGE_STRATEGIES_H

struct object_id;
struct index_state;
typedef int (*merge_index_fn)(struct index_state *istate,
			      const struct object_id *orig_blob,
			      const struct object_id *our_blob,
			      const struct object_id *their_blob,
			      const char *path, unsigned int orig_mode,
			      unsigned int our_mode, unsigned int their_mode,
			      void *data);

int merge_index_path(struct index_state *istate, int oneshot, int quiet,
		     const char *path, merge_index_fn fn, void *data);
int merge_all_index(struct index_state *istate, int oneshot, int quiet,
		    merge_index_fn fn, void *data);

#endif /* MERGE_STRATEGIES_H */