t / t5100 / msg0016on commit Merge branch 'jk/color-diff-plain-is-context' into maint (6998d89)
   1and some content
   2