t / lib-httpd / passwdon commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1user@host:xb4E8pqD81KQs