RelNoteson commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1Documentation/RelNotes/2.3.8.txt