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