t / t4013 / diff.diff_--name-status_dir2_diron commit checkout -m: recreate merge when checking out of unmerged index (0cf8581)
   1$ git diff --name-status dir2 dir
   2$