Merge commit 'v1.7.0' into jc/checkout-reflog-fix
[git] / t / t5100 / msg0016
1 and some content
2