t / t4013 / diff.diff_--no-index_dir_dir3on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1$ git diff --no-index dir dir3
   2$