t / t5100 / emptyon commit rerere: add documentation for conflict normalization (fb90dca)
   1