t / t4013 / diff.diff_--no-index_dir_dir3on commit handle_delete_modify(): Check whether D/F conflicts are still present (84a08a4)
   1$ git diff --no-index dir dir3
   2$