Merge branch 'sb/merge-recursive-copy-paste-fix'
[git] / t / t5100 / msg0016
1 and some content
2