t / t4013 / diff.diff_--no-index_dir_dir3on commit t6036: add lots of detail for directory/file conflicts in recursive case (327ac9c)
   1$ git diff --no-index dir dir3
   2$