The version is 9.6 Build 320. 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...