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>
Junio C Hamano committed
Jan 15, 2010 at 22:50 UTC
88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e
1 file changed
+1
-4
rerere.c
+1
-4
@@ -1,7 +1,6 @@
1
#include "cache.h"
2
#include "string-list.h"
3
#include "rerere.h"
4
-#include "xdiff/xdiff.h"
4
#include "xdiff-interface.h"
5
#include "dir.h"
6
#include "resolve-undo.h"
@@ -332,7 +331,6 @@ static int merge(const char *name, const char *path)
331
int ret;
332
mmfile_t cur, base, other;
333
mmbuffer_t result = {NULL, 0};
335
- xmparam_t xmp = {{XDF_NEED_MINIMAL}};
334
335
if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
336
return 1;
@@ -341,8 +339,7 @@ static int merge(const char *name, const char *path)
339
read_mmfile(&base, rerere_path(name, "preimage")) ||
340
read_mmfile(&other, rerere_path(name, "postimage")))
341
return 1;
344
- ret = xdl_merge(&base, &cur, "", &other, "",
345
- &xmp, XDL_MERGE_ZEALOUS, &result);
342
+ ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);
343
if (!ret) {
344
FILE *f = fopen(path, "w");
345
if (!f)