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