X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.h;h=244a31f55ac7375b59d7c257bfc2391957fdca94;hb=a12c6b0149e3dadd0701dac4fd0ba2463d251650;hp=5388422d091ede134d42406291989c49553f7428;hpb=4d9e42f8f11c57b32b976a943c8ddaf6214e64b8;p=git.git

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d0..244a31f55 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -5,11 +5,20 @@
 #ifndef LL_MERGE_H
 #define LL_MERGE_H
 
+struct ll_merge_options {
+	unsigned virtual_ancestor : 1;
+	unsigned variant : 2;	/* favor ours, favor theirs, or union merge */
+	unsigned renormalize : 1;
+	long xdl_opts;
+};
+
 int ll_merge(mmbuffer_t *result_buf,
 	     const char *path,
-	     mmfile_t *ancestor,
+	     mmfile_t *ancestor, const char *ancestor_label,
 	     mmfile_t *ours, const char *our_label,
 	     mmfile_t *theirs, const char *their_label,
-	     int virtual_ancestor);
+	     const struct ll_merge_options *opts);
+
+int ll_merge_marker_size(const char *path);
 
 #endif