Merge branch 'jc/merge-drop-old-syntax'
[git] / t / t5100 / msg0016
1 and some content
2