diff --git a/ll-merge.c b/ll-merge.c
index 4d8e321b09aed8ad2381386668fa53069c7223d1..007dd3e4d38ff657a29a06e559173b796f193763 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
memset(&xmp, 0, sizeof(xmp));
xmp.level = XDL_MERGE_ZEALOUS;
xmp.favor = opts->variant;
+ xmp.xpp.flags = opts->xdl_opts;
if (git_xmerge_style >= 0)
xmp.style = git_xmerge_style;
if (marker_size > 0)