Merge branch 'nd/gitignore-trailing-whitespace'
[git] / t / t5100 / msg0016
1 and some content
2