Merge branch 'kb/am-deprecate-resolved'
[git] / t / t5100 / msg0016
1 and some content
2