Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 82c3e210002d452867a46a9d8806a8aee82ae9d0 authored by Junio C Hamano on 29 August 2009, 21:31:01 UTC
GIT 1.6.4.2
Tip revision: 82c3e21
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