t / t5100 / rfc2047-info-0005on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Subject: (a)
   2