t / t5100 / msg0006on commit Merge branch 'cb/mergetool' (b371922)
   1Here is a patch from A U Thor.
   2