t / lib-httpd / passwdon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1user@host:xb4E8pqD81KQs