diff options
Diffstat (limited to 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h index 57754cc8ca..ff7ca87bfa 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -5,6 +5,21 @@ #ifndef LL_MERGE_H #define LL_MERGE_H +#define LL_OPT_VIRTUAL_ANCESTOR (1 << 0) +#define LL_OPT_FAVOR_MASK ((1 << 1) | (1 << 2)) +#define LL_OPT_FAVOR_SHIFT 1 +#define LL_OPT_RENORMALIZE (1 << 3) + +static inline int ll_opt_favor(int flag) +{ + return (flag & LL_OPT_FAVOR_MASK) >> LL_OPT_FAVOR_SHIFT; +} + +static inline int create_ll_flag(int favor) +{ + return ((favor << LL_OPT_FAVOR_SHIFT) & LL_OPT_FAVOR_MASK); +} + int ll_merge(mmbuffer_t *result_buf, const char *path, mmfile_t *ancestor, const char *ancestor_label, |