t / lib-httpd / passwdon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1user@host:nKpa8pZUHx/ic