The twentieth batch

[thirdparty/git.git] / merge-ll.c

diff --git a/merge-ll.c b/merge-ll.c
index 61e0ae53981dbc786061a1b8ed7689ca5fee3912..bf1077ae0928e99cb0c5dc0814fecf9e141447b7 100644 (file)
--- a/merge-ll.c
+++ b/merge-ll.c
@@ -128,7 +128,9 @@ static enum ll_merge_result ll_xdl_merge(const struct ll_merge_driver *drv_unuse
        xmp.level = XDL_MERGE_ZEALOUS;
        xmp.favor = opts->variant;
        xmp.xpp.flags = opts->xdl_opts;
-       if (git_xmerge_style >= 0)
+       if (opts->conflict_style >= 0)
+               xmp.style = opts->conflict_style;
+       else if (git_xmerge_style >= 0)
                xmp.style = git_xmerge_style;
        if (marker_size > 0)
                xmp.marker_size = marker_size;
@@ -401,7 +403,7 @@ enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
             const struct ll_merge_options *opts)
 {
        struct attr_check *check = load_merge_attributes();
-       static const struct ll_merge_options default_opts;
+       static const struct ll_merge_options default_opts = LL_MERGE_OPTIONS_INIT;
        const char *ll_driver_name = NULL;
        int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
        const struct ll_merge_driver *driver;