Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint
[git] / t / t5100 / msg0016
1 and some content
2