3-way merge in Visual SourceSafe using external tool

Question

I have WinMerge set up as my diff tool for VSS 2005. However WinMerge doesn't support 3-way merge (see #1.4). The docs for VSS say that 3-way merge IS supported in VSS:

if Visual SourceSafe detects that two of you have both modified the same piece of a file, a three-way merge technique must be used

I'd like recommendations on a good (free) tool I can use which will retain the ability to do 3-way merge, and is better than VSS' own merge/diff tool.

I need to know how to integrate this with VSS, so VSS calls it when diff/merge operations are called.

Answer 1

I recommend KDiff3:

http://kdiff3.sourceforge.net/

Others

Meld is typically used with Git on Linux, and, there's a Windows version:

https://live.gnome.org/Meld/Windows

I haven't used it in a while, but, I think many Windows people would recommend p4Merge

http://www.perforce.com/downloads/complete_list#ntx86