t / t5100 / msg0016on commit Merge branch 'rj/maint-difftool-cygwin-workaround' into maint (ea95907)
   1and some content
   2