X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.c;h=f221bed1e97a0f1b41d1845edac270a109e3a4dd;hb=03f622c81fed05bb571519beacb0eeaf595c65f4;hp=a59f74f76c293efa783103eaf3d167c97b3768ea;hpb=3b37d9c17efd199a237435f7d8573008f6aa68c1;p=git.git

diff --git a/rerere.c b/rerere.c
index a59f74f76..f221bed1e 100644
--- a/rerere.c
+++ b/rerere.c
@@ -319,7 +319,7 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
 		if (!mmfile[i].ptr && !mmfile[i].size)
 			mmfile[i].ptr = xstrdup("");
 	}
-	ll_merge(&result, path, &mmfile[0],
+	ll_merge(&result, path, &mmfile[0], NULL,
 		 &mmfile[1], "ours",
 		 &mmfile[2], "theirs", 0);
 	for (i = 0; i < 3; i++)
@@ -376,7 +376,7 @@ static int merge(const char *name, const char *path)
 		ret = 1;
 		goto out;
 	}
-	ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);
+	ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0);
 	if (!ret) {
 		FILE *f = fopen(path, "w");
 		if (!f)