t / t4013 / diff.diff_--no-index_dir_dir3on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1$ git diff --no-index dir dir3
   2$