From xradiograph

Programming: Diff


Stack Overflow: Text difference algorithms
Google Code: Google diff match patch
Gnu Diff Utils




I tend to use WinMerge and ediff (in Emacs)


Win Merge?

I’m suprised I haven’t added something like this before, since I use Win Merge? as the diff tool in VS 2010.
I just started using it for TFS merges, as well. SOOO Oooo? much better than the built-in tool in 2010.


Using WinMerge for TFS compare & merge


From Tool, Options, Source Control, Visual Studio Team Foundation Server, Configure User Tools button, Add button:

    Extension: .*
    Operation: Compare
    Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
    Arguments: /e /wl /dl %6 /dr %7 %1 %2

And then press again the Add button:

    Extension: .*
    Operation: Merge
    Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
    Arguments: /ub /dl %6 /dr %7 %1 %2 %4



Explanation of all the parameters, sure to be elsewhere, as well.



See Also



Category tags


Retrieved from
Page last modified on September 09, 2014, at 01:53 PM