From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Jan 2010 06:50:01 +0000 (-0800)
Subject: rerere: use ll_merge() instead of using xdl_merge()
X-Git-Tag: v1.7.0-rc0~53^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e;p=git.git

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 adb069481..5b8ebcb62 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)