t / t4252 / file-2-0on commit rerere: add documentation for conflict normalization (fb90dca)
   11
   22
   33
   44
   55
   66
   77