t / t5100 / msg0006on commit Merge branch 'jk/difftool-in-subdir' into maint (a558332)
   1Here is a patch from A U Thor.
   2