Command Parameters for Diff and Merge Tools

Diff

{backing stream version}

Quoted pathname of the first version to be compared.

{workspace version}

Quoted pathname of the second version to be compared.

Merge

{common ancestor version}

Quoted filename of the closest common ancestor version.

{backing stream version}

Quoted filename of the version in the backing stream, or other non-workspace version.

{workspace version}

Quoted filename of the version in the workspace.

{merge results}

Quoted name of the merge-output file, which is a temporary file for storing the results of the merge.

These command parameters are preformatted for supported third party Diff and Merge tools. If you are configuring a custom Diff or Merge tool, you must ensure that the command parameters you specify are correct for that tool. For example, if you were configuring SourceGear DiffMerge, you might configure the Diff tool as follows:

/c="AccuRev Diff" /ro2 /t1="First" /t2="Second" {backing stream version}
{workspace version}

Similarly, the Merge tool might be configured as follows:

/c="AccuRev Diff" -merge -result={merge results} /t1="First" /t2="Second" /t3="Third"
{backing stream version} {workspace version} {common ancestor version}

The executable for both Diff and Merge tools might be defined as follows:

C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe

Specific command parameters vary from tool to tool. See your tool’s documentation for more information.