DiffMerge 3.02

Graphically shows the changes between two files, including intra-line highlighting and full support for editing. Allows automatic 3-way merging (when safe to do so) and full control over editing the resulting file. Configurable rulesets and options...