t / t5100 / msg0017on commit rerere: add documentation for conflict normalization (fb90dca)
   1New content here
   2