Found useful article:
http://www.neovolve.com/post/2007/06/19/using-winmerge-with-tfs.aspxI will store batch here to be sure it will not lost.
It runs winmerge and correctly exits.
"%PROGRAMFILES(X86)%\Winmerge\WinMergeU.exe" /x /e /ub /wl /dl %1 /dr %2 %3 %4 %5
exit 0
Settings for visual studio tfs:
- For Extension, type *
- For Operation, select Merge
- For Command, browse for C:\Program Files\WinMerge\winmergeFromTFS.bat
- For Arguments, type %6 %7 %1 %2 %4
Upd: fixed path to winmerge on my system.
No comments:
Post a Comment