t / t5100 / msg0016on commit Tighten and correct a few testcases for merging and cherry-picking (7c5585f)
   1and some content
   2