DiffMerge is an application to visually compare and merge files within Windows. It graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. It allows automatic merging (when safe to do so) and full control over editing the resulting file. 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.
What is new in this release:
Version 3.3.2 fixed crash in 64-bit versions (observed on Ubuntu 11.04 and 11.10) that happened when launching the Options Dialog.