Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 35eabd1579726d594e84fc8328a5c87693dd065a authored by Junio C Hamano on 20 January 2010, 20:44:59 UTC, committed by Junio C Hamano on 20 January 2010, 20:44:59 UTC 
Git 1.6.5.8
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 806e5c8
Raw File
Tip revision: 35eabd1579726d594e84fc8328a5c87693dd065a authored by Junio C Hamano on 20 January 2010, 20:44:59 UTC
Git 1.6.5.8
Tip revision: 35eabd1
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