X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=ll-merge.h;h=6c6e22e40d9bab4b5071319acd5356993e7888b4;hb=02561896de9d4cd2354e825bf7e6304a3c19d1c3;hp=b72b19921e8f33ab23aa5bb6293b9b6841035df9;hpb=a3c2e2f32734c95e9226362b627a0b64fd69d3c8;p=thirdparty%2Fgit.git

diff --git a/ll-merge.h b/ll-merge.h
index b72b19921e..6c6e22e40d 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -7,6 +7,8 @@
 
 #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 */
@@ -19,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