t / t5100 / msg0016on commit rerere: add documentation for conflict normalization (fb90dca)
   1and some content
   2