t / t4013 / diff.diff_--name-status_dir2_diron commit checkout -f: allow ignoring unmerged paths when checking out of the index (db94109)
   1$ git diff --name-status dir2 dir
   2$