Merge branch 'jc/maint-reset-unmerged-path'
[git] / t / t5100 / msg0016
1 and some content
2