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