Merge branch 'maint'
[git] / ll-merge.h
1 /*
2  * Low level 3-way in-core file merge.
3  */
4
5 #ifndef LL_MERGE_H
6 #define LL_MERGE_H
7
8 int ll_merge(mmbuffer_t *result_buf,
9              const char *path,
10              mmfile_t *ancestor,
11              mmfile_t *ours, const char *our_label,
12              mmfile_t *theirs, const char *their_label,
13              int virtual_ancestor);
14
15 #endif