X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=rerere.c;h=861ca7c815b4857f1fde399617860e5a179e2ca3;hb=442cb08fa0dca38c99cf1ff8a5654a95a5cad7a4;hp=f42649c4991000786629ee3773ab7b8055403cce;hpb=e3efa9c12c1797f5eeb140ebeb44ff6d210ec215;p=thirdparty%2Fgit.git

diff --git a/rerere.c b/rerere.c
index f42649c499..861ca7c815 100644
--- a/rerere.c
+++ b/rerere.c
@@ -319,6 +319,10 @@ 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);