t / t5100 / msg0006on commit Merge branch 'rh/mergetool-regression-fix' (7cef7fa)
   1Here is a patch from A U Thor.
   2