t / t5100 / emptyon commit mergetools: add support for guiffy (6ceb658)
   1