swh:1:snp:47f1e8bb459169b0feb652a9c3d9cbabd8526d4a
Raw File
Tip revision: f371d3ea3ca7933df787230f2eb9b67901bde9d3 authored by Junio C Hamano on 08 December 2008, 01:34:14 UTC
Point "stale" 1.6.0.5 documentation from the main git documentation page
Tip revision: f371d3e
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