t / t4013 / diff.diff_--name-status_dir2_diron commit unpack-trees: fix oneway_merge accidentally carry over stage index (ab5af82)
   1$ git diff --name-status dir2 dir
   2$