ll-merge: make flag easier to populate
[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
73cf7f71
JN
8#define LL_OPT_VIRTUAL_ANCESTOR (1 << 0)
9#define LL_OPT_FAVOR_MASK ((1 << 1) | (1 << 2))
10#define LL_OPT_FAVOR_SHIFT 1
11
12static inline int ll_opt_favor(int flag)
13{
14 return (flag & LL_OPT_FAVOR_MASK) >> LL_OPT_FAVOR_SHIFT;
15}
16
17static inline int create_ll_flag(int favor)
18{
19 return ((favor << LL_OPT_FAVOR_SHIFT) & LL_OPT_FAVOR_MASK);
20}
21
525ab639
JH
22int ll_merge(mmbuffer_t *result_buf,
23 const char *path,
f01de62e 24 mmfile_t *ancestor, const char *ancestor_label,
525ab639
JH
25 mmfile_t *ours, const char *our_label,
26 mmfile_t *theirs, const char *their_label,
8cc5b290 27 int flag);
525ab639 28
8588567c
JH
29int ll_merge_marker_size(const char *path);
30
525ab639 31#endif