Merge branch 'jv/maint-no-ext-diff'
[git] / t / t5100 / msg0016
1 and some content
2