]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 468165c) | patch
mergetools: add support for guiffy
authorBill Ritcher <Bill_Ritcher@guiffy.com>
Thu, 5 Apr 2018 13:55:01 +0000 (08:55 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Apr 2018 23:11:39 +0000 (08:11 +0900)
commit6ceb658c9905cad2436810370c6590fc260a6b64
tree46c45c149fe7f442e5d0f4e7ed1e109d845fb7b3tree | snapshot
parent468165c1d8a442994a825f3684528361727cd8c0commit | diff
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>
mergetools/guiffy [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.