t / t4013 / diff.diff_--name-status_dir2_diron commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1$ git diff --name-status dir2 dir
   2$