Merge branch 'en/merge-path-collision'

[thirdparty/git.git] / ll-merge.h

diff --git a/ll-merge.h b/ll-merge.h
index 6c6e22e40d9bab4b5071319acd5356993e7888b4..b9e2af1c884042adda8127a07ce8565b64303047 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;
 };