summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
Diffstat (limited to 'll-merge.h')
-rw-r--r--ll-merge.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h
index 6c6e22e..b9e2af1 100644
--- 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;
};