mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 14:57:52 +01:00
Code Activity
git/mergetools
History
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 mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
bc mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
bc3 mergetool: rename bc3 to bc 2014-10-21 11:25:30 -07:00
codecompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
deltawalker mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
diffmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
diffuse mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
ecmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
emerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
examdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
guiffy mergetools: add support for guiffy 2018-04-06 08:11:39 +09:00
gvimdiff
gvimdiff2
gvimdiff3 mergetools: add vimdiff3 mode 2014-04-22 12:49:07 -07:00
kdiff3 mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
kompare mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
meld mergetools/meld: improve compatibiilty with Meld on macOS X 2017-06-18 22:11:29 -07:00
opendiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
p4merge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
tkdiff mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
tortoisemerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
vimdiff mergetools/vimdiff: trust Vim's exit code 2016-11-29 10:57:41 -08:00
vimdiff2
vimdiff3 mergetools: add vimdiff3 mode 2014-04-22 12:49:07 -07:00
winmerge mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
xxdiff Merge branch 'da/mergetool-xxdiff-hotkey' 2016-12-19 14:45:41 -08:00