Diff/Merge Options

This set of options allows you to specify the text file comparison and merge tools that AccuRev Plug-In for Visual Studio PE will use, as well as how certain characters are treated if you use AccuRev’s tools.

When specifying values for the Diff Tools and Merge Tools fields, you have several options:

• Use AccuRev’s own tools — By default, the setting is AccuRev, indicating the graphical diff and merge tools that are part of the AccuRev product.
• Choose another tool from the list — The change affects AccuRev Plug-In for Visual Studio PE only; it does not affect the AccuRev GUI (which can also be configured to use third-party diff and merge tools).
• Specify a command line to be executed when the Diff or Merge command is invoked. This command line must contain the name of a text file comparison or merge tool, and a series of substitution patterns which indicate the files being compared or merged. The tool must either be in a directory on your search path, or be specified with an absolute path.

Diff Substitution Patterns

%1%

When the command line is executed, this pattern will be replaced by the quoted pathname of the first version to be compared.

%2%

Will be replaced by the quoted pathname of the second version to be compared.

%3%

Will be replaced by a displayable title string (unquoted) for the first version.

%4%

Will be replaced by a displayable title string (unquoted) for second version.

Merge Substitution Patterns

%a%

When the command line is executed, this pattern will be replaced by the quoted pathname of the closest common ancestor version.

%1%

Will be replaced by the quoted pathname of the non-workspace version.

%2%

Will be replaced by the quoted pathname of the version in the workspace.

%3%

Will be replaced by a displayable title string (unquoted) for the closest common ancestor version.

%4%

Will be replaced by a displayable title string (unquoted) for the non-workspace version.

%5%

Will be replaced by a displayable title string (unquoted) for the workspace version.

%o%

Will be replaced by the quoted pathname of a temporary file, in which the results of the merge can be stored.

The next three options affect AccuRev's graphical Diff and Merge tools only. If you configure other text file comparison or merge tools, these settings are ignored.

Ignore Whitespace

Controls whether whitespace is taken into account when comparing text lines. Overrides the Ignore Changes in Whitespace option.

Ignore Changes in Whitespace

Controls whether a change in the amount of whitespace in a text line is considered to be a change.

Ignore Case

Controls whether uppercase and lowercase characters are considered to be the same when comparing text lines.