X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=ll-merge.h;h=244a31f55ac7375b59d7c257bfc2391957fdca94;hb=c14f3727913a67835ad38d17edcbfe4e1c94e9a7;hp=57754cc8ca7b378a86b168a4fd6299fa3dfba045;hpb=bd01c6de67715586f7527115bb4f74e7929b3b66;p=thirdparty%2Fgit.git

diff --git a/ll-merge.h b/ll-merge.h
index 57754cc8ca..244a31f55a 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -5,12 +5,19 @@
 #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, const char *ancestor_label,
 	     mmfile_t *ours, const char *our_label,
 	     mmfile_t *theirs, const char *their_label,
-	     int flag);
+	     const struct ll_merge_options *opts);
 
 int ll_merge_marker_size(const char *path);