Merge branch 'jk/commit-how-to-abort-cherry-pick'
[git] / t / t5100 / msg0016
1 and some content
2