git-commit-vandalism/mergetools
Bill Ritcher 6ceb658c99 mergetools: add support for guiffy
Add guiffy as difftool and mergetool

guiffy is available on Windows, Linux, and MacOS

Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com>
Reviewed-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-04-06 08:11:39 +09:00
..
araxis
bc
bc3 mergetool: rename bc3 to bc 2014-10-21 11:25:30 -07:00
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
examdiff
guiffy mergetools: add support for guiffy 2018-04-06 08:11:39 +09:00
gvimdiff
gvimdiff2
gvimdiff3
kdiff3
kompare
meld mergetools/meld: improve compatibiilty with Meld on macOS X 2017-06-18 22:11:29 -07:00
opendiff
p4merge
tkdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
tortoisemerge
vimdiff
vimdiff2
vimdiff3
winmerge
xxdiff