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