t / t4013 / diff.diff-tree_masteron commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1$ git diff-tree master
   2$