test that git status works with merge conflict in, .gitmodules
[git] / contrib / completion /
drwxr-xr-x   ..
-rwxr-xr-x 58130 git-completion.bash