Menu
I am using TFS for source control, but I want to use SourceGear DiffMerge for viewing file differences and doing merges. I found the Tools -> Options -> Source Control -> Visual Studio Team Foundation Server -> Configure User Tools dialog, but setting up the merge parameters is very confusing. What should those parameters be?
802
DiffMerge is an application to visually compare and merge files for Windows, MacOS, and Linux. DiffMerge can graphically show the changes between multiple files with intra-line highlighting and full support for editing. Learn More.
DiffMerge is an application to visually compare and merge files on Windows, OS X and Linux.
SourceGear DiffMerge is licensed for use free of charge. However, to help fund new feature development and ongoing product maintenance, SourceGear asks DiffMerge users to register the product for a small fee and receive a registration key.
These are the SourceGear settings that I use:
C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
Compare:
/t1=%6 /t2=%7 %1 %2
Merge:
/m /r=%4 /t1=%7 /t2=%8 /t3=%6 /c=%9 %2 %3 %1
These are my settings. Can't remember where I got them from but I have used them in VS2010, VS2012, VS2013.
C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
Compare
/title1=%6 /title2=%7 %1 %2
Merge
/title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2
40
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
