SourceGear DiffMerge for Linux

Visually Compare and Merge files for Windows, Mac OS X and Unix. * 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.