t / lib-httpd / passwdon commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1user@host:xb4E8pqD81KQs