RelNoteson commit builtin-rerere: more carefully find conflict markers (99d698f)
   1Documentation/RelNotes-1.6.0.txt