diff --git a/rerere.c b/rerere.c
index 3d00a71ff9730ed4a10114185f4360de698c1fbf..22dfc843da1528ffd0466d496c50c56702e55a24 100644 (file)
--- a/rerere.c
+++ b/rerere.c
ret = 1;
goto out;
}
ret = 1;
goto out;
}
- ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0);
+ ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", NULL);
if (!ret) {
FILE *f;
if (!ret) {
FILE *f;