t / t5100 / msg0016on commit difftool: don't overwrite modified files (67aa147)
   1and some content
   2