t / t5100 / msg0001on commit rerere: add documentation for conflict normalization (fb90dca)
   1Here is a patch from A U Thor.
   2