t / t4013 / diff.diff_--no-index_dir_dir3on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1$ git diff --no-index dir dir3
   2$