t / t5100 / rfc2047-info-0004on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Author: Nathaniel Borenstein (םולש ןב ילטפנ)
   2Email: nsb@thumper.bellcore.com
   3Subject: Test of new header generator
   4