RelNoteson commit mergetools: add support for guiffy (6ceb658)
   1Documentation/RelNotes/2.17.0.txt