Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: b0883aa6c77111e88496bd0afe073caf68ab9f99 authored by Junio C Hamano on 30 January 2010, 20:08:26 UTC
is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
Tip revision: b0883aa
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 flag);

int ll_merge_marker_size(const char *path);

#endif
back to top