mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-16 14:04:52 +01:00

18 lines

337 B

C

Raw Normal View History

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 09:36:00 +01: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,`
			`mmfile_t *ancestor,`
			`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 03:23:55 +01: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 09:36:00 +01:00
rerere: honor conflict-marker-size attribute Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-01-17 08:28:46 +01: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 09:36:00 +01:00			`#endif`