summaryrefslogtreecommitdiff
path: root/ll-merge.h
blob: b9e2af1c884042adda8127a07ce8565b64303047 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
/*
 * Low level 3-way in-core file merge.
 */
 
#ifndef LL_MERGE_H
#define LL_MERGE_H
 
#include "xdiff/xdiff.h"
 
struct index_state;
 
struct ll_merge_options {
	unsigned virtual_ancestor : 1;
	unsigned variant : 2;	/* favor ours, favor theirs, or union merge */
	unsigned renormalize : 1;
	unsigned extra_marker_size;
	long xdl_opts;
};
 
int ll_merge(mmbuffer_t *result_buf,
	     const char *path,
	     mmfile_t *ancestor, const char *ancestor_label,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     struct index_state *istate,
	     const struct ll_merge_options *opts);
 
int ll_merge_marker_size(struct index_state *istate, const char *path);
 
#endif