Skip to main content

Browse the archive

Staging
v0.5.1
Revision b9aa901856cee7ad16737343f6a372bb37871258 authored by Junio C Hamano on 10 April 2010, 20:05:16 UTC, committed by Junio C Hamano on 10 April 2010, 20:05:16 UTC 
Git 1.7.1-rc1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b92cbb6
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