Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 9a8c2b67cd5a51666f2c0ce3fbbdb08b97b79b3d authored by Junio C Hamano on 17 December 2014, 19:30:46 UTC
Git 2.0.5
Tip revision: 9a8c2b6
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