Revision 9504f3d3d2e62cb6fba9e7c61c6fe69dec9053a4 authored by Junio C Hamano on 20 January 2010, 21:29:21 UTC, committed by Junio C Hamano on 20 January 2010, 21:29:21 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 66276d9
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 ...
