|
Contact |
FAQ | File Difference |
Getting Started Guide
VssConnect relies on an
external application to handle file difference and file
merging operations. This helps keep the cost of VssConnect
down and it allows the user to use their favorite
application for these tasks. This page is dedicated to
listing some of the choices available along with the command
line parameters that should be used within VssConnect.
Note: 3-way merging is not
required but it greatly simplifies file merging when working
with multiple checkout databases.
File Difference
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\WinMerge\WinMerge.exe
Command Arguments: %1 %2 /dl $1 /dr $2
/u
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\WinMerge\WinMerge.exe"
%1 %2
File Merge (2-way only)
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\WinMerge\WinMerge.exe
Command Arguments:%1 %2 %4 /dl $1 /dr
$2 /u /wl
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\WinMerge\WinMerge.exe"
%1 %2
File Difference
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Compare
It!\wincmp3.exe
Command Arguments: %1 /=$1 %2 /=$2
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Compare It!\wincmp3.exe" %1 %2
File Merge (2-way only)
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Compare
It!\wincmp3.exe
Command Arguments: %1 /=$1 %2 /=$2 /R1
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Compare It!\wincmp3.exe" %1 %2
File Difference
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Araxis\Araxis Merge
v6.5\compare.exe
Command Arguments: %1 %2 /title1:$1
/title2:$2 /wait /max
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Araxis\Araxis Merge
v6.5\compare.exe" %1 %2 /wait /max
File Merge (2-way)
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Araxis\Araxis Merge
v6.5\compare.exe
Command Arguments: %1 %2 %4 /title1:$1
/title2:$2 /wait /max
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Araxis\Araxis Merge
v6.5\compare.exe" %1 %2 /wait /max
File Merge (3-way)
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Araxis\Araxis Merge
v6.5\compare.exe
Command Arguments: %1 %2 %3 %4 /a3
/title1:$1 /title2:$2 /title3:$3 /wait /max
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Araxis\Araxis
Merge v6.5\compare.exe" %3 %2 %1 /3 /a2 /wait /max
Tip: You may also want to disable the
confirmation to close Merge when file comparisons are open.
Go to the 'View' menu, select 'Options', select the
'Application' node and un-check 'Confirm application close
when file comparisons are open'.
File Difference
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Beyond Compare
2\BC2.exe
Command Arguments: %1 %2 /title1=$1
/title2=$2
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Beyond Compare
2\BC2.exe" %1 %2 /readonly
File Merge (2-way)
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Beyond Compare
2\BC2.exe
Command Arguments: %1 %2 /mergeoutput=%4
/title1=$1 /title2=$2 /title4=$4
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Beyond Compare
2\BC2.exe" %1 %2
File Merge (3-way)
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\Beyond Compare
2\BC2.exe
Command Arguments: %1 %2 %3 %4
/title1=$1 /title2=$2 /title3=$3
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\Beyond Compare
2\BC2.exe" %1 %2 %3
Tip: Uncheck the checkbox on the initial
startup dialog if you want BeyondCompare to go immediately
to the file comparison view.
This file diff program may be of interest
to Delphi and C# programmers. It understands Delphi and C#
source code syntax and is therefore able to intelligently
show the difference between two files. If methods and fields
have simply been moved or white space changes have been
made, Structured Diff View will not report a difference in
the files (although it does have a display mode that will
display the difference).
File Difference
VssConnect 1.6.3318 or greater
Application Path: C:\Program Files\ModelMakerTools\MMSDV\1.10\mmsdv.exe
Command Arguments: %1 %2
VssConnect
1.6.3172 or less
Command Line: "C:\Program Files\ModelMakerTools\MMSDV\1.10\mmsdv.exe"
%1 %2
File Merge
Does not support file merging.
|
WinDiff - Microsoft - Free! |
WinDiff.exe is file difference program
supplied by Microsoft with various development tools. It
does not handle merging and it's features are limited.
File Difference
VssConnect 1.6.3318 or greater
Application Path: WinDiff.exe
Command Arguments: %1 %2
VssConnect
1.6.3172 or less
Command Line: "WinDiff.exe"
%1 %2
File Merge Command Line
Does not support file merging. |
