1/*
2* Low level 3-way in-core file merge.
3*/
45
#ifndef LL_MERGE_H
6#define LL_MERGE_H
78
int ll_merge(mmbuffer_t *result_buf,
9const char *path,
10mmfile_t *ancestor, const char *ancestor_label,
11mmfile_t *ours, const char *our_label,
12mmfile_t *theirs, const char *their_label,
13int flag);
1415
int ll_merge_marker_size(const char *path);
1617
#endif