t / t5100 / msg0015on commit Merge branch 'dm/mergetool-vimdiff' (0141215)
   1  - a list
   2  - of stuff