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