t / t4013 / diff.diff_--no-index_--name-status_--_dir2_diron commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1$ git diff --no-index --name-status -- dir2 dir
   2A       dir/sub
   3$