SourceGear release DiffMerge - for free

A good, free, 3-way merging tool is very difficult to come by. Most tools that diff and merge either are not free, or they do not support 3-way merging, or they are simply have limited editing capabilities.

Up to now, I have only found one tool that features all of these characteristics. However, SourceGear have now changed that by releasing their DiffMerge tool for free.

DiffMerge includes features such as graphical diff, graphical merging between 3 files, folder diff, rulesets per file type and it is cross platform. Embarrassingly, the tool does not support keyboard shortcuts.

Configuring TortoiseSVN to use DiffMerge

After installing DiffMerge, you can configure TortoiseSVN to use DiffMerge as the default tool to diff files and to resolve conflicts. Navigate to the Settings screen in TortoiseSVN and locate the Diff Viewer option on the left. Enter all the options like the screenshot below.

The text in the textbox is as follows:

"C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe" /t1=Mine /t2=Theirs %mine %theirs

Then click on the Merge Tool option on the left, and fill the form values in the same way, except that the textbox should have the following text:

"C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe" /t1=Mine /t2=Base /t3=Theirs /r=%merged %mine %base %theirs

The next time that you edit a conflict while using TortoiseSVN, DiffMerge will open.