Merge branch 'jk/userdiff-config-simplify'
[git] / t / t5100 / msg0016
1 and some content
2