RelNoteson commit git-rerere: detect unparsable conflicts (a1b32fd)
   1Documentation/RelNotes-1.5.6.txt