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

This allows us to pay attention to the attribute settings and custom
merge driver the user sets up.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/rerere.c b/rerere.c
index adb069481ce3c253dca4de7eed2a07990a6d61c7..5b8ebcb6287b3396d580eb228d4861d667c7ff23 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -1,7 +1,6 @@
 #include "cache.h"
 #include "string-list.h"
 #include "rerere.h"
 #include "cache.h"
 #include "string-list.h"
 #include "rerere.h"

-#include "xdiff/xdiff.h"

 #include "xdiff-interface.h"
 #include "dir.h"
 #include "resolve-undo.h"
 #include "xdiff-interface.h"
 #include "dir.h"
 #include "resolve-undo.h"


@@ -332,7 +331,6 @@ static int merge(const char *name, const char *path)
        int ret;
        mmfile_t cur, base, other;
        mmbuffer_t result = {NULL, 0};
        int ret;
        mmfile_t cur, base, other;
        mmbuffer_t result = {NULL, 0};

-       xmparam_t xmp = {{XDF_NEED_MINIMAL}};

 
        if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
                return 1;
 
        if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
                return 1;


@@ -341,8 +339,7 @@ static int merge(const char *name, const char *path)
                        read_mmfile(&base, rerere_path(name, "preimage")) ||
                        read_mmfile(&other, rerere_path(name, "postimage")))
                return 1;
                        read_mmfile(&base, rerere_path(name, "preimage")) ||
                        read_mmfile(&other, rerere_path(name, "postimage")))
                return 1;

-       ret = xdl_merge(&base, &cur, "", &other, "",
-                       &xmp, XDL_MERGE_ZEALOUS, &result);
+       ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);

        if (!ret) {
                FILE *f = fopen(path, "w");
                if (!f)
        if (!ret) {
                FILE *f = fopen(path, "w");
                if (!f)