t / t4013 / diff.diff_--name-status_dir2_diron commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1$ git diff --name-status dir2 dir
   2$