diff options
Diffstat (limited to 'll-merge.h')
-rw-r--r-- | ll-merge.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -11,6 +11,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; }; |