Among the diff/merge tools I’ve used, I am impressed the most with SourceGear DiffMerge tool. The SO community also recommended it.
I’ve been working with .Net & open-source technologies – the source-code management client-tool I used is Visual Studio and TortoiseSVN. Here’s how we configure these two tools to work with DiffMerge.
DiffMerge used in Visual Studio 2010
Open Visual Studio options by Tools-Options and open the `Source Control – Visual Studio Team Foundation Server` section.
Then, use the below DiffMerge execution syntax in textbox 3rd in the screenshot. Note that <DiffMerge.exe> stands for path to DiffMerge execution file location.
[compare]
<DiffMerge.exe> /title1=%6 /title2=%7 %1 %2
[merge]
<DiffMerge.exe> /title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2
DiffMerge used in TortoiseSVN
Open Tortoise setting and open the `External Programs` section.
Then, use the below DiffMerge execution syntax in textbox 3rd in the screenshot.
[compare]
<DiffMerge.exe> /title1=%yname /title2=%bname %mine %base
[merge]
<DiffMerge.exe> /title1=%yname /title2=%bname /title3=tname /result=%merged %mine %base %theirs
Hope this is helpful to you!
Nam.
Posted by Tom Robinson (@tjrobinson) on December 9, 2011 at 11:29 PM
Hi Nam,
I used your settings but found it didn’t seem to be working quite right when doing merges. I’ve found some alternative settings here:
http://nbaked.wordpress.com/2010/04/07/using-diffmerge-with-visual-studio/
I’ll see if they work better and let you know.
Tom