Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 66aaa2fc22c8494d9019b241f5d6395a6044a895 authored by Junio C Hamano on 20 April 2008, 18:36:53 UTC
GIT 1.5.5.1
Tip revision: 66aaa2f
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