t / t4013 / diff.diff_--name-status_dir2_diron commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1$ git diff --name-status dir2 dir
   2$