Skip to main content

Browse the archive

Staging
v0.5.1
Revision 9918285fb10d81af9021dae99c5f4de88ded497c authored by Junio C Hamano on 07 July 2010, 18:19:42 UTC, committed by Junio C Hamano on 07 July 2010, 18:19:42 UTC 
Git 1.7.2-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2a16315
Raw File
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
back to top