test that git status works with merge conflict in, .gitmodules
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1886 git-new-workdir