summaryrefslogtreecommitdiff
path: root/ll-merge.h
blob: 5388422d091ede134d42406291989c49553f7428 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
/*
 * Low level 3-way in-core file merge.
 */
 
#ifndef LL_MERGE_H
#define LL_MERGE_H
 
int ll_merge(mmbuffer_t *result_buf,
	     const char *path,
	     mmfile_t *ancestor,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     int virtual_ancestor);
 
#endif