summaryrefslogtreecommitdiff
path: root/mergetools/guiffy
AgeCommit message (Collapse)Author
2018-04-05mergetools: add support for guiffyBill Ritcher
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>