RelNoteson commit rerere: plug conflict ID leaks (8d9b5a4)
   1Documentation/RelNotes/2.3.8.txt