Merge branch 'al/mergetool-printf-fix'
[git] / t / t5100 / msg0016
1 and some content
2