RelNoteson commit rerere: split conflict ID further (1869bbe)
   1Documentation/RelNotes/2.3.8.txt