diff options
Diffstat (limited to 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h index 4b707f06c..244a31f55 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -9,6 +9,7 @@ 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, |