Skip to main content

Browse the archive

Staging
v0.5.1
Revision 42817b96b1b80b56fd5a4d5e0d6239524b1832a3 authored by Junio C Hamano on 30 October 2013, 19:17:47 UTC, committed by Junio C Hamano on 30 October 2013, 19:17:47 UTC 
Git 1.8.5-rc0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 05ad292
Raw File
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