Merge branch 'dl/rebase-i-keep-base'

diff --git a/ll-merge.h b/ll-merge.h
index b72b19921e8f33ab23aa5bb6293b9b6841035df9..e78973dd55ed596e26dcf4a372671ad03b97986a 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -7,10 +7,13 @@
 
 #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;
 };
 
@@ -19,8 +22,10 @@ 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);
+void reset_merge_attributes(void);
 
 #endif