t / t4013 / diff.diff_--name-status_dir2_diron commit handle_delete_modify(): Check whether D/F conflicts are still present (84a08a4)
   1$ git diff --name-status dir2 dir
   2$