Merge branch 'ew/empty-merge-with-dirty-index'
[git] / t / t5100 / msg0016
1 and some content
2