t / t5100 / msg0017on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1New content here
   2