Diff tool for C# source code (Part 2)

I'm back with more information on the diff tool for VS (2005) and TFS (2005).
I've decided to use DiffMerge. It may be just me, but I like it better. It's still nowhere as good as Araxis, but since it's free, i shouldn't complain i guess :)

To set up your own diff tool in VS 2005: Tools -> Options. Select Source Control > Visual Studio Team Foundation Server and click Configure User Tools... Then click Add... and specify:

Extension: cs
Operation: Compare
Command : %path to the diffmerge.exe%
Arguments: %1 %2

Obviously, you can do the same for vb, resx, etc...

Now, IMPORTANT thing. This DOES NOT REPLACE THE COMPARE TOOL USED FOR CHECK-IN, which imho totally suxs. So, you need to identify all conflicting files first, then select them one by one e.g. in the solution explorer and click Compare (right-click menu item). This is where the specified Diff tool is shown and you can modify your source prior to checking them in. On check-in, you then select Use Local Version. Make sure that the file didn't get changed on the server in the mean-time though!