Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 80d93611c55fec171e0d9aba98db079952f9d7aa authored by Junio C Hamano on 10 December 2009, 00:21:36 UTC, committed by Junio C Hamano on 10 December 2009, 00:21:36 UTC 
Git 1.6.6-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 529f8c6
Raw File
Tip revision: 80d93611c55fec171e0d9aba98db079952f9d7aa authored by Junio C Hamano on 10 December 2009, 00:21:36 UTC
Git 1.6.6-rc2
Tip revision: 80d9361
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,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     int virtual_ancestor);

#endif
back to top