RelNoteson commit rerere: add documentation for conflict normalization (fb90dca)
   1Documentation/RelNotes/2.19.0.txt