t / lib-httpd / passwdon commit merge-recursive: Fix working copy handling for rename/rename/add/add (3672c97)
   1user@host:nKpa8pZUHx/ic