DiffMerge is an application to visually compare and merge files and folders on Windows, Mac OS X, and Linux. • Diff: Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. • Merge: Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file. • Folder Diff: Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical, equivalent or different. • Windows Explorer/Shell Integration: Right-click on any two files or folders in Windows Explorer to diff them immediately. • Configurable: Rulesets and options provide for customized appearance and behavior. • International: DiffMerge is a UNICODE-based application and can import files in a wide range of character encodings. • Cross-platform: Identical feature set on Windows, Mac OS X, and Linux. DiffMerge_3.3.2_ENU_inf_addon.cab Size: 5.81 Mb (6,091,104 bytes) MD5: 8EEC5373A5ABFC5E6A3A08C7ED8C4B9F (Note: This addon is ENU only)