t / t5100 / msg0016on commit unpack-trees: do not fail reset because of unmerged skipped entry (b33fdfc)
   1and some content
   2