t / lib-httpd / passwdon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1user@host:xb4E8pqD81KQs