t / lib-httpd / passwdon commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1user@host:xb4E8pqD81KQs