Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: b4f86a4ce85e4e370a67455de6586a02f158a789 authored by Junio C Hamano on 02 May 2014, 20:15:52 UTC
Git 2.0-rc2
Tip revision: b4f86a4
ll-merge.h
/*
 * Low level 3-way in-core file merge.
 */

#ifndef LL_MERGE_H
#define LL_MERGE_H

struct ll_merge_options {
	unsigned virtual_ancestor : 1;
	unsigned variant : 2;	/* favor ours, favor theirs, or union merge */
	unsigned renormalize : 1;
	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,
	     const struct ll_merge_options *opts);

int ll_merge_marker_size(const char *path);

#endif
back to top