diff options
Diffstat (limited to 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ll-merge.h b/ll-merge.h index 244a31f55a..b9e2af1c88 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -5,10 +5,15 @@ #ifndef LL_MERGE_H #define LL_MERGE_H +#include "xdiff/xdiff.h" + +struct index_state; + struct ll_merge_options { unsigned virtual_ancestor : 1; unsigned variant : 2; /* favor ours, favor theirs, or union merge */ unsigned renormalize : 1; + unsigned extra_marker_size; long xdl_opts; }; @@ -17,8 +22,9 @@ int ll_merge(mmbuffer_t *result_buf, mmfile_t *ancestor, const char *ancestor_label, mmfile_t *ours, const char *our_label, mmfile_t *theirs, const char *their_label, + struct index_state *istate, const struct ll_merge_options *opts); -int ll_merge_marker_size(const char *path); +int ll_merge_marker_size(struct index_state *istate, const char *path); #endif |