Merge branch 'jc/diff-merge-base-multi'
[git] / t / t5100 / msg0016
1 and some content
2