test that git status works with merge conflict in, .gitmodules
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rwxr-xr-x 1886 git-new-workdir