t / lib-httpd / passwdon commit merge-strategies: avoid implying that "-s theirs" exists (c25d98b)
   1user@host:xb4E8pqD81KQs