From: Junio C Hamano Date: Sun, 17 Jan 2010 09:39:01 GMT Subject: [PATCH 5/8] rerere: use ll_merge() instead of using xdl_merge() Message-ID: <1263721144-18605-6-git-send-email-gitster@pobox.com> In-Reply-To: <1263721144-18605-1-git-send-email-gitster@pobox.com> This allows us to pay attention to the attribute settings and custom merge driver the user sets up. Signed-off-by: Junio C Hamano --- rerere.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/rerere.c b/rerere.c index adb0694..5b8ebcb 100644 --- a/rerere.c +++ b/rerere.c @@ -1,7 +1,6 @@ #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" @@ -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}; - xmparam_t xmp = {{XDF_NEED_MINIMAL}}; 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; - 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) -- 1.6.6.405.g80ed6.dirty