Merge branch 'pw/patience-diff-clean-up'
[git] / t / t5100 / msg0016
1 and some content
2