Skip to main content

Browse the archive

Staging
v0.5.1
Revision 94058a90cf3e10122037cd80ea48d3d52be5efd9 authored by Junio C Hamano on 16 December 2009, 20:50:33 UTC, committed by Junio C Hamano on 16 December 2009, 20:50:33 UTC 
Git 1.6.6-rc3
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a1bb8f4
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