t / t5100 / msg0009on commit rerere: add documentation for conflict normalization (fb90dca)
   1This is to fix diff-format documentation.
   2