t / t5100 / msg0018on commit rerere: add documentation for conflict normalization (fb90dca)
   1a commit message
   2