DiffMerge : Visually compare and merge files in Windows, Mac OS X and Unix

DiffMerge is a very cool application that allows you to visually compare and merge files. This is very useful when you want to find minusucle differences between two very identical files. The best thing is that this software runs in all the three major Operating Systems - Windows, Mac OS X and Unix.

Here are some of the features of this cool software :

• 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.
• 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.

The Best of all feature is that it is a completely FREE software. So head over to the website and grab it.