Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
[git] / t / lib-httpd / passwd
1 user@host:xb4E8pqD81KQs