]>
git.ipfire.org Git - thirdparty/git.git/blob - ll-merge.h
2 * Low level 3-way in-core file merge.
8 int ll_merge(mmbuffer_t
*result_buf
,
11 mmfile_t
*ours
, const char *our_label
,
12 mmfile_t
*theirs
, const char *their_label
,
13 int virtual_ancestor
);