swh:1:snp:47f1e8bb459169b0feb652a9c3d9cbabd8526d4a
Raw File
Tip revision: 1b7e543a6e2f156536a3cf227f9da1029bba6265 authored by Dévai Tamás on 11 February 2009, 23:14:02 UTC
git-svn: Fix for rewriteRoot URL containing username.
Tip revision: 1b7e543
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