Merge branch 'js/diff-files-i-t-a-fix-for-difftool'
[git] / t / t5100 / msg0016
1 and some content
2