swh:1:snp:6df5a50b8107b6bbe1e51d0239d816a7503c536a
Raw File
Tip revision: e15c16de396a1e1f42001b03cb885ce64eb4098e authored by Junio C Hamano on 07 August 2012, 17:39:34 UTC
Git 1.7.12-rc2
Tip revision: e15c16d
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