Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 5469e2dab133a197dc2ca2fa47eb9e846ac19b66 authored by Junio C Hamano on 19 April 2010, 05:19:04 UTC, committed by Junio C Hamano on 19 April 2010, 05:19:04 UTC 
Git 1.7.1-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 407a963
Raw File
Tip revision: 5469e2dab133a197dc2ca2fa47eb9e846ac19b66 authored by Junio C Hamano on 19 April 2010, 05:19:04 UTC
Git 1.7.1-rc2
Tip revision: 5469e2d
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