Revision cb572206d9dac4ba52878e7e1a4a7028d85707ab authored by Junio C Hamano on 16 September 2009, 21:53:26 UTC, committed by Junio C Hamano on 16 September 2009, 21:53:26 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent af4f640
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 ...
