Guiffy eXpert 11.6
Guiffy is a file compare diff tool, folder compare, and merge tool.
This diff/merge tool includes inline difference highlighting, integrated folder and filetree comparisons, 3-way auto-merge, command line interface and API for automation, SCM integrations and application plug-ins. Guiffy produces reports as HTML with support for color printing. File comparing options include folded views for support of large files. Supports over 150 file encoding formats such as UTF8, UTF16, MBCS, SJIS, and multi-lingual Unicode fonts. 11.6 release includes: 1) SureMerge Intelligence improved. 2) Image Diff server mode. 3) Inline differences highlighting improved.