t / t4013 / diff.diff_--no-index_dir_dir3on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1$ git diff --no-index dir dir3
   2$