[thirdparty/git.git] / ll-merge.h

/*
 * 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, const char *ancestor_label,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     int flag);

int ll_merge_marker_size(const char *path);

#endif
Commit	Line	Data
525ab639 JH	1	/*
	2	* Low level 3-way in-core file merge.
	3	*/
	4
	5	#ifndef LL_MERGE_H
	6	#define LL_MERGE_H
	7
	8	int ll_merge(mmbuffer_t *result_buf,
	9	const char *path,
f01de62e	10	mmfile_t ancestor, const char ancestor_label,
525ab639 JH	11	mmfile_t ours, const char our_label,
525ab639 JH	12	mmfile_t theirs, const char their_label,
8cc5b290	13	int flag);
525ab639	14
8588567c JH	15	int ll_merge_marker_size(const char *path);
8588567c JH	16
525ab639	17	#endif