t / t4013 / diff.diff_--no-index_dir_dir3on commit Avoid conflicts when merging branches with mixed normalization (f217f0e)
   1$ git diff --no-index dir dir3
   2$