test that git status works with merge conflict in, .gitmodules
[git] / t / lib-httpd / passwd
1 user@host:nKpa8pZUHx/ic