Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 25 lines (19 sloc) 0.567 kB
525ab63 @gitster merge-recursive: split low-level merge functions out.
gitster authored
1 /*
2 * Low level 3-way in-core file merge.
3 */
4
5 #ifndef LL_MERGE_H
6 #define LL_MERGE_H
7
712516b @jrn ll-merge: replace flag argument with options struct
jrn authored
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;
58a1ece merge-recursive --patience
Justin Frankel authored
12 long xdl_opts;
712516b @jrn ll-merge: replace flag argument with options struct
jrn authored
13 };
73cf7f7 @jrn ll-merge: make flag easier to populate
jrn authored
14
525ab63 @gitster merge-recursive: split low-level merge functions out.
gitster authored
15 int ll_merge(mmbuffer_t *result_buf,
16 const char *path,
f01de62 @jrn ll_merge(): add ancestor label parameter for diff3-style output
jrn authored
17 mmfile_t *ancestor, const char *ancestor_label,
525ab63 @gitster merge-recursive: split low-level merge functions out.
gitster authored
18 mmfile_t *ours, const char *our_label,
19 mmfile_t *theirs, const char *their_label,
712516b @jrn ll-merge: replace flag argument with options struct
jrn authored
20 const struct ll_merge_options *opts);
525ab63 @gitster merge-recursive: split low-level merge functions out.
gitster authored
21
8588567 @gitster rerere: honor conflict-marker-size attribute
gitster authored
22 int ll_merge_marker_size(const char *path);
23
525ab63 @gitster merge-recursive: split low-level merge functions out.
gitster authored
24 #endif
Something went wrong with that request. Please try again.