Merge branch 'aw/rebase-am-failure-detection'
[git] / t / t5100 / msg0016
1 and some content
2