Free Diff Merge Tool: P4Merge

I’ve been using a free merge tool called P4Merge and it’s a lot better than the built in one that comes with TortoiseSVN. It seems like it’s a lot more intelligent and figures out when the conflicts are just two adds vs two modifications. Thus, it saved me so much time when doing a merge because I just opened, reviewed, and saved the file with the tool when it was in conflicted state and it had resolved already most of my issues without me doing anything. A lot better than the other tools I’ve used. Obviously, you still need to review each conflict but it should made it a lot easier than previously.

Note that when you run the install just unselect all the other items except for the merge tool.

You’ll need to modify your TortoiseSVN settings:

• Right-click anywhere in file explorer
• Click TortoiseSVN
• Click Settings
• Click Diff Viewer
• Select External and enter: C:\Program Files\Perforce\p4merge.exe  %base %mine
• Click Merge Tool
• Select External and enter: C:\Program Files\Perforce\p4merge.exe  %base %theirs %mine %merged
• Click OK or Apply

Or, for TortoiseHg settings:

• Right-click anywhere in file explorer
• Click TortoiseHg
• Click Global Settings
• Change Three-way Merge Tool to "p4merge"
• Change Visual Diff Tool to "p4merge"

UPDATE: I've switched to using Hg for source and provided the settings needed to use P4Merge with TortoiseHg.