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