Revision 3273ebc759ee44fa22026d2882d56010742c6797 authored by Junio C Hamano on 01 December 2008, 07:01:53 UTC, committed by Junio C Hamano on 01 December 2008, 08:55:19 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent aaab7ea
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
Computing file changes ...
