The Merge Page

The Merge Page of the Add/Edit External Tool Dialog lets you configure the tool to be used for File Merges.

The descriptions for most of these fields are identical to the descriptions on the previous page for File Diffs.

DiffMerge defines the following substitution tokens for File Merges:

%WORKING_LABEL% %OTHER_LABEL%

The labels for the “working” (left) and “other” (right) files.

When DiffMerge is handing off the initial set of files received on the command line to an external tool, the values for these tokens come from the /title1 and /title3 arguments given to DiffMerge. Otherwise, they default to the pathnames of the corresponding files.

%DEST_LABEL%

The label for the “destination” (center) file.

When DiffMerge is handing off the initial set of files received on the command line to an external tool, the value for this token come from the /title2 argument given to DiffMerge. Otherwise, it defaults to the pathname of the destination result or the common ancestor baseline file.

%WORKING_PATH% %OTHER_PATH%

The pathnames of the “working” (left) and “other” (right) files.

%BASELINE_PATH%

The pathname of the “baseline” (center) file. This is the common ancestor.

%DEST_PATH%

The pathname where the merge result should be written.

This comes from the /result argument given to DiffMerge. It falls back to the baseline pathname.

Prev Up Next
 Home