rerere: add documentation for conflict normalization

diff --git a/rerere.c b/rerere.c
index be98c0afcb9fa48ae9d637046c50774889af385f..da1ab54027261bfb929af4154d653453b3c0fbad 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -394,10 +394,6 @@ static int is_cmarker(char *buf, int marker_char, int marker_size)
  * and NUL concatenated together.
  *
  * Return the number of conflict hunks found.
- *
- * NEEDSWORK: the logic and theory of operation behind this conflict
- * normalization may deserve to be documented somewhere, perhaps in
- * Documentation/technical/rerere.txt.
  */
 static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_size)
 {