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 | ||
712516bc JN |
8 | struct ll_merge_options { |
9 | unsigned virtual_ancestor : 1; | |
10 | unsigned variant : 2; /* favor ours, favor theirs, or union merge */ | |
11 | unsigned renormalize : 1; | |
58a1ece4 | 12 | long xdl_opts; |
712516bc | 13 | }; |
73cf7f71 | 14 | |
525ab639 JH |
15 | int ll_merge(mmbuffer_t *result_buf, |
16 | const char *path, | |
f01de62e | 17 | mmfile_t *ancestor, const char *ancestor_label, |
525ab639 JH |
18 | mmfile_t *ours, const char *our_label, |
19 | mmfile_t *theirs, const char *their_label, | |
712516bc | 20 | const struct ll_merge_options *opts); |
525ab639 | 21 | |
8588567c JH |
22 | int ll_merge_marker_size(const char *path); |
23 | ||
525ab639 | 24 | #endif |