t / lib-httpd / passwdon commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1user@host:nKpa8pZUHx/ic