DiffMerge is an application to visually compare and merge files for Windows, Mac OS X and Unix.
特征综述 About Feature
声明：本产品中文介绍为慧都控件网版权所有，未经慧都公司书面许可，严禁拷贝、转载！
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 or different.
Windows Explorer Integration. Right-click on any two files in Windows Explorer to diff them immediately.
Configurable. Rulesets and options provide for customized appearance and behavior.
International. Compatible with 42 different character encodings.
Cross-platform. Identical feature set on Windows, Mac OS X, and Unix.
