t / t5100 / msg0016on commit Merge branch 'jc/deprecate-old-syntax-from-merge' (36a83f3)
   1and some content
   2