Revision ec82874ad47627a44b6b22a6645551a214293711 authored by Junio C Hamano on 15 December 2010, 19:27:41 UTC, committed by Junio C Hamano on 15 December 2010, 19:27:41 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ...