Documentation/technical: document ll_merge
[git/git.git] / ll-merge.h
... / ...
CommitLineData
1/*
2 * Low level 3-way in-core file merge.
3 */
4
5#ifndef LL_MERGE_H
6#define LL_MERGE_H
7
8int ll_merge(mmbuffer_t *result_buf,
9 const char *path,
10 mmfile_t *ancestor, const char *ancestor_label,
11 mmfile_t *ours, const char *our_label,
12 mmfile_t *theirs, const char *their_label,
13 int flag);
14
15int ll_merge_marker_size(const char *path);
16
17#endif