t / t5100 / msg0017on commit Merge branch 'rh/mergetool-regression-fix' (7cef7fa)
   1New content here
   2