Merge branch 'jk/color-diff-plain-is-context' into maint
[git] / t / t5100 / msg0016
1 and some content
2