Merge branch 'jk/combine-diff-binary-etc'
[git] / t / t5100 / msg0016
1 and some content
2