t / t4013 / diff.diff_--name-status_dir2_diron commit "reset --merge": fix unmerged case (e11d7b5)
   1$ git diff --name-status dir2 dir
   2$