Skip to main content

Browse the archive

Staging
v0.5.1
Revision f23ffbe890d36e277f02d4a84c2b52de3a4e3173 authored by Junio C Hamano on 17 December 2008, 06:08:22 UTC, committed by Junio C Hamano on 17 December 2008, 06:08:28 UTC 
GIT 1.5.5.6
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parent s 006f31d + 34b146c
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