t / t5100 / msg0016on commit Merge branch 'jk/diff-color-moved-fix' into maint (fd50623)
   1and some content
   2