RelNoteson commit rerere: teach rerere to handle nested conflicts (4af3220)
   1Documentation/RelNotes/2.19.0.txt