Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jp/send-email-to-cmd'
[gitweb.git]
/
ll-merge.c
diff --git
a/ll-merge.c
b/ll-merge.c
index 4d8e321b09aed8ad2381386668fa53069c7223d1..007dd3e4d38ff657a29a06e559173b796f193763 100644
(file)
--- a/
ll-merge.c
+++ b/
ll-merge.c
@@
-86,6
+86,7
@@
static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
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)