| commit | 6ceb658c9905cad2436810370c6590fc260a6b64 | |
| author | Bill Ritcher <Bill_Ritcher@guiffy.com> | |
| Thu, 5 Apr 2018 13:55:01 +0000 (5 08:55 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Apr 2018 23:11:39 +0000 (6 08:11 +0900) | ||
| tree | 46c45c149fe7f442e5d0f4e7ed1e109d845fb7b3 | treesnapshot (tar.gz zip) |
| parent | 468165c1d8a442994a825f3684528361727cd8c0 | commitdiff |
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>
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>
| mergetools/guiffy | [new file with mode: 0644] | blob |