Skip to main content

Browse the archive

Staging
v0.5.1
Revision 080cbc1275ac09445136ba429d90b5ec85e92c1c authored by Junio C Hamano on 16 November 2009, 08:05:12 UTC, committed by Junio C Hamano on 16 November 2009, 08:05:12 UTC 
Git 1.6.5.3
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c6b53c8
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,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     int virtual_ancestor);

#endif
back to top