Revision 4133fd25525022f99d2c7ba339618433bdd919fe authored by Junio C Hamano on 10 February 2010, 21:44:11 UTC, committed by Junio C Hamano on 10 February 2010, 21:44:11 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 216d2e0
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 ...