t / t5100 / msg0001on commit Merge branch 'da/maint-mergetool-twoway' (5e92376)
   1Here is a patch from A U Thor.
   2