t / t3900 / UTF-16.txton commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1