t / t5100 / rfc2047-info-0002on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Author: Olle Järnefors
   2Email: ojarnef@admin.kth.se
   3Subject: Time for ISO 10646?
   4