Some notes on software development... RSS 2.0
# Thursday, 19 September 2013

Download and install the latest version of DiffMerge 

From the Visual Studio 2010 menu select Tools->Options->Source Control->Visual Studio Team Foundation Server->Configure User Tools

Add the following…

Compare
Extension: .*
Operation: Compare
Command: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
Argument: /t1=%6 /t2=%7 %1 %2

 image

Merge
Extension: .*
Operation: Merge
Command: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
Argument: /m /r=%4 /t1=%7 /t2=%8 /t3=%6 /c=%9 %2 %3 %1

image

Thursday, 19 September 2013 08:54:26 (GMT Standard Time, UTC+00:00)  #    -
Source Control | Visual Studio
# Saturday, 13 August 2011

Settings for DiffMerge and Visual SourceSafe are:

Set the extension to be .*

Then use the following command Lines:

For File Difference:
C:\Program Files\SourceGear\DiffMerge\diffmerge.exe --title1="original version" --title2="modified version" %1 %2

For File Merge:
C:\Program Files\SourceGear\DiffMerge\diffmerge.exe --title1="source branch" --title2="base version" --title3="destination branch" --result=%4 %1 %3 %2


image

Saturday, 13 August 2011 09:00:00 (GMT Standard Time, UTC+00:00)  #    -
Source Control
Navigation

Sign In
Extras
Statistics
Total Posts: 116
This Year: 0
This Month: 0
This Week: 0
Comments: 36
About the author/Disclaimer

Disclaimer
The opinions expressed herein are my own personal opinions and do not represent my employer's view in any way.

© Copyright 2017
Hadrian Phillips

All Content © 2017, Hadrian Phillips
DasBlog theme 'Business' created by Christoph De Baene (delarou)