ll-merge.h 567 Bytes
Newer Older
1 2 3 4 5 6 7
/*
 * Low level 3-way in-core file merge.
 */

#ifndef LL_MERGE_H
#define LL_MERGE_H

8 9 10 11
struct ll_merge_options {
	unsigned virtual_ancestor : 1;
	unsigned variant : 2;	/* favor ours, favor theirs, or union merge */
	unsigned renormalize : 1;
Justin Frankel's avatar
Justin Frankel committed
12
	long xdl_opts;
13
};
14

15 16
int ll_merge(mmbuffer_t *result_buf,
	     const char *path,
17
	     mmfile_t *ancestor, const char *ancestor_label,
18 19
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
20
	     const struct ll_merge_options *opts);
21

22 23
int ll_merge_marker_size(const char *path);

24
#endif