Merge branch 'maint'

[git.git] / ll-merge.h

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d091ede134d42406291989c49553f7428..244a31f55ac7375b59d7c257bfc2391957fdca94 100644 (file)
--- 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