swh:1:snp:6df5a50b8107b6bbe1e51d0239d816a7503c536a
Raw File
Tip revision: 9861b644e045b5ee0e16dea65b44419205090960 authored by Junio C Hamano on 10 December 2009, 23:42:30 UTC
Git 1.6.5.6
Tip revision: 9861b64
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
back to top