t / t4252 / file-2-0on commit mergetools: add support for guiffy (6ceb658)
   11
   22
   33
   44
   55
   66
   77