t / lib-httpd / passwdon commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1user@host:xb4E8pqD81KQs