t / t5100 / msg0015on commit Merge branch 'jk/difftool-in-subdir' (7647537)
   1  - a list
   2  - of stuff