t / lib-httpd / passwdon commit merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base (c52ff85)
   1user@host:nKpa8pZUHx/ic