t / lib-httpd / passwdon commit merge overwrites unstaged changes in renamed file (30fd3a5)
   1user@host:nKpa8pZUHx/ic