Merge branch 'rs/combine-diff-zero-context-at-the-beginning'
[git] / t / t5100 / msg0016
1 and some content
2