Imported Upstream version 2.21.0

[platform/upstream/git.git] / ll-merge.h

diff --git a/ll-merge.h b/ll-merge.h
index 6c6e22e..b9e2af1 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -13,6 +13,7 @@ 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;
 };