t / t4013 / diff.diff_--name-status_dir2_diron commit am: suppress apply errors when using 3-way (3ddd170)
   1$ git diff --name-status dir2 dir
   2$