Merge branch 'en/merge-path-collision'
[git] / t / t5100 / msg0016
1 and some content
2