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
merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com> 2007-12-24 11:36:00 +03:00			`/*`
			`* 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,`
ll_merge(): add ancestor label parameter for diff3-style output Commands using the ll_merge() function will present conflict hunks imitating ‘diff3 -m’ output if the merge.conflictstyle configuration option is set appropriately. Unlike ‘diff3 -m’, the output does not include a label for the merge base on the \|\|\|\|\|\|\| line of the output, and some tools misparse the conflict hunks without that. Add a new ancestor_label parameter to ll_merge() to give callers the power to rectify this situation. If ancestor_label is NULL, the output format is unchanged. All callers pass NULL for now. Requested-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-03-21 03:38:58 +03:00			`mmfile_t ancestor, const char ancestor_label,`
merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com> 2007-12-24 11:36:00 +03:00			`mmfile_t ours, const char our_label,`
			`mmfile_t theirs, const char their_label,`
git merge -X<option> Teach "-X <option>" command line argument to "git merge" that is passed to strategy implementations. "ours" and "theirs" autoresolution introduced by the previous commit can be asked to the recursive strategy. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-11-26 05:23:55 +03:00			`int flag);`
merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com> 2007-12-24 11:36:00 +03:00
rerere: honor conflict-marker-size attribute Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-01-17 10:28:46 +03:00			`int ll_merge_marker_size(const char *path);`

merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com> 2007-12-24 11:36:00 +03:00			`#endif`