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