X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.c;h=22dfc843da1528ffd0466d496c50c56702e55a24;hb=f9ad901fd31991837c9648bbee8ac18b39aa0891;hp=3d00a71ff9730ed4a10114185f4360de698c1fbf;hpb=61e8aaf6215a2983610a770645e6d0a24bafb454;p=git.git

diff --git a/rerere.c b/rerere.c
index 3d00a71ff..22dfc843d 100644
--- a/rerere.c
+++ b/rerere.c
@@ -438,7 +438,7 @@ static int merge(const char *name, const char *path)
 		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;