summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-16 06:50:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-17 07:45:33 (GMT)
commit88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e (patch)
tree4eead9d7f1d7fb95b0fe6f367fbf4a330f2c485d /rerere.c
parent15b4f7a68d8c3c8ee28424415b203f61202d65d1 (diff)
downloadgit-88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e.zip
git-88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e.tar.gz
git-88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e.tar.bz2
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>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c5
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)