t / lib-httpd / passwdon commit rerere: split conflict ID further (1869bbe)
   1user@host:xb4E8pqD81KQs