t / lib-httpd / passwdon commit merge: avoid "safer crlf" during recording of merge results (1335d76)
   1user@host:xb4E8pqD81KQs