t / lib-httpd / passwdon commit unpack-trees: do not fail reset because of unmerged skipped entry (b33fdfc)
   1user@host:xb4E8pqD81KQs