rerere: use ll_merge() instead of using xdl_merge()

diff --git a/ll-merge.c b/ll-merge.c
index 2d6b6d6cb1d2bc2d334bf058feb3444e94b5a781..be2bf433a97bcff8010cfeff6cdea8e2c23168f2 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -61,7 +61,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
                        mmfile_t *src2, const char *name2,
                        int virtual_ancestor)
 {
-       xpparam_t xpp;
+       xmparam_t xmp;
        int style = 0;
 
        if (buffer_is_binary(orig->ptr, orig->size) ||
@@ -76,13 +76,13 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
                                       virtual_ancestor);
        }
 
-       memset(&xpp, 0, sizeof(xpp));
+       memset(&xmp, 0, sizeof(xmp));
        if (git_xmerge_style >= 0)
                style = git_xmerge_style;
        return xdl_merge(orig,
                         src1, name1,
                         src2, name2,
-                        &xpp, XDL_MERGE_ZEALOUS | style,
+                        &xmp, XDL_MERGE_ZEALOUS | style,
                         result);
 }
 
@@ -344,7 +344,7 @@ static const char *git_path_check_merge(const char *path)
        static struct git_attr_check attr_merge_check;
 
        if (!attr_merge_check.attr)
-               attr_merge_check.attr = git_attr("merge", 5);
+               attr_merge_check.attr = git_attr("merge");
 
        if (git_checkattr(path, 1, &attr_merge_check))
                return NULL;