DiffnMerge screenshots

Compare and merge text and HTML files line by line. Compare and merge folders
DiffnMerge 1.3 : Main Window
DiffnMerge 1.3 : Main Window

Alternative downloads

TortoiseSVN
Free
rating

Easy-to-use SCM / source control software.

Araxis Merge
rating

Advanced 2 and 3-way file comparison (diff), merging and folder synchronization.

Agent SVN
rating

Is a Microsoft Common Source Code Control Interface (MS-SCCI) plug-in.