Guiffy is a diff merge tool and folder compare application and API. SureMerge is the most trustworthy source code 3-way merge tool available. Advanced features include tuneable inline diff highlighting, syntax highlighting and a blend of 3 diff algorithms