t / t5100 / msg0016on commit Merge branch 'rh/mergetool-regression-fix' (7cef7fa)
   1and some content
   2