t / t5100 / rfc2047-info-0003on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4