tfs - using winmerge as your merge/diff tool
If you’re used to using something like winmerge with your SCM of choice, if you wind up using TFS, the built-in diff/merge tools can leave much to be desired.
Here is how to change the tool VS 2kX uses to do diffs/merges when hooked up to TFS (note that these are my settings for using winmerge for ALL file types):
Go To: Tools/Options/SourceControl/Visual Studio Team Foundation Server/Configure User Tools
Click “Add…”
Extension: .*
Operation: Compare
Command: C:\Program Files\WinMerge\WinMergeU.exe
Arguments: /e /wl /dl %6 /dr %7 %1 %2
Click “Add…”
Extension: .*
Operation: Merge
Command: C:\Program Files\WinMerge\WinMergeU.exe
Arguments: /ub /dl %6 /dr %7 %1 %2 %4
The winmerge command line reference can be found here.