commit-reach: prepare in_merge_bases[_many] to handle any repo

diff --git a/ll-merge.h b/ll-merge.h
index 244a31f55ac7375b59d7c257bfc2391957fdca94..6c6e22e40d9bab4b5071319acd5356993e7888b4 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -5,6 +5,10 @@
 #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 */
@@ -17,8 +21,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