]>
Commit | Line | Data |
---|---|---|
525ab639 JH |
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, | |
f01de62e | 10 | mmfile_t *ancestor, const char *ancestor_label, |
525ab639 JH |
11 | mmfile_t *ours, const char *our_label, |
12 | mmfile_t *theirs, const char *their_label, | |
8cc5b290 | 13 | int flag); |
525ab639 | 14 | |
8588567c JH |
15 | int ll_merge_marker_size(const char *path); |
16 | ||
525ab639 | 17 | #endif |