ll-merge.h


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

/*
 * 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);

int ll_merge_marker_size(const char *path);

#endif