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