X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.c;h=d2608434750c336c3f3881efda8373b7c67d4b11;hb=13a4899886958c211b96bced228fdaaa42674491;hp=861ca7c815b4857f1fde399617860e5a179e2ca3;hpb=4682693e9ccc04252d0fad6f5627fc056abcdbba;p=git.git

diff --git a/rerere.c b/rerere.c
index 861ca7c81..d26084347 100644
--- a/rerere.c
+++ b/rerere.c
@@ -325,7 +325,7 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
 	 */
 	ll_merge(&result, path, &mmfile[0], NULL,
 		 &mmfile[1], "ours",
-		 &mmfile[2], "theirs", 0);
+		 &mmfile[2], "theirs", NULL);
 	for (i = 0; i < 3; i++)
 		free(mmfile[i].ptr);