Monday, May 21, 2012
Using WinMerge as merge/diff tool in TFS
Original source: http://jonfuller.codingtomusic.com/2008/08/26/tfs-using-winmerge-as-your-mergediff-tool/
Thanks Jon!
In VS, 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.
Subscribe to:
Post Comments (Atom)
Hey, thanks for sharing this! FYI, I moved my blog to here: https://fullerjc.blogspot.com/2008/08/tfs-using-winmerge-as-your-mergediff.html
ReplyDelete