Merge branch 'rj/maint-difftool-cygwin-workaround'
[git] / t / t5100 / msg0016
1 and some content
2