Revision a0178ae2cfd79a1da5d7ddfacadb1e41560bb464 authored by Ralf Wildenhues on 27 November 2008, 07:32:01 UTC, committed by Junio C Hamano on 27 November 2008, 09:00:45 UTC
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5aa3bdd
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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...