RelNoteson commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Documentation/RelNotes/2.6.1.txt