Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[git] / t / t5100 / msg0017
1 New content here
2