t / t5100 / msg0018on commit mergetools: add support for guiffy (6ceb658)
   1a commit message
   2