t / t5100 / msg0006on commit Merge branch 'dm/mergetool-vimdiff' (0141215)
   1Here is a patch from A U Thor.
   2