t / t5100 / msg0009on commit git-rerere: detect unparsable conflicts (a1b32fd)
   1This is to fix diff-format documentation.
   2