t / t4013 / diff.diff-tree_--patch-with-stat_initialon commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1$ git diff-tree --patch-with-stat initial
   2$