t / t4013 / diff.diff_--name-status_dir2_diron commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1$ git diff --name-status dir2 dir
   2$