https://github.com/git/git
Raw File
Tip revision: 2aedccd3d51ec922020f7c7e39df5d2c4d3af515 authored by Junio C Hamano on 27 July 2010, 23:42:47 UTC
Git 1.7.2.1
Tip revision: 2aedccd
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, const char *ancestor_label,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     int flag);

int ll_merge_marker_size(const char *path);

#endif
back to top