Merge branch 'so/log-diff-merges-opt'
[git] / t / t5100 / msg0016
1 and some content
2