t / lib-httpd / passwdon commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1user@host:nKpa8pZUHx/ic