X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.c;h=d2608434750c336c3f3881efda8373b7c67d4b11;hb=79c461d5b1139afa3d3997c7ef9ee521562b2a1a;hp=f42649c4991000786629ee3773ab7b8055403cce;hpb=22ffc39a0332e892ddbf16b39d9b611aff238d9b;p=git.git

diff --git a/rerere.c b/rerere.c
index f42649c49..d26084347 100644
--- a/rerere.c
+++ b/rerere.c
@@ -319,9 +319,13 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
 		if (!mmfile[i].ptr && !mmfile[i].size)
 			mmfile[i].ptr = xstrdup("");
 	}
+	/*
+	 * NEEDSWORK: handle conflicts from merges with
+	 * merge.renormalize set, too
+	 */
 	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);