t / lib-httpd / passwdon commit merge-recursive: Fix spurious 'refusing to lose untracked file...' messages (f53d397)
   1user@host:nKpa8pZUHx/ic