Use a custom file merge tool

You can use a custom file merge tool for automatic and manual merge.

Manual merge

Limitations: Not available in the Eclipse integration.

Dimensions CM uses the following merge tools by default:

Windows (desktop and web clients, Synchronize Wizard, and the Visual Studio and Windows Explorer integrations) Araxis Merge
UNIX (web client) mgdiff

You can configure your own tool for manual merge, and set it as the default. For details, see the configuring the default merge tools section in Administration.

Tip: We recommend using a three-way file merge tool. This way, you can see local and repository revisions, and the common ancestor, when you select changes to apply to the merge target.

Automatic merge

Note: Available in the desktop client and the Windows Explorer and Visual Studio integrations.

The default automatic merge tool is the GNU cross-platform diff utility, but you can use your own tool.

To instruct Dimensions CM to use a different automatic merge tool, on your client (or an agent for remote work areas), edit the %DM_ROOT%\Prog\dmdiff.cmd file or the corresponding SH file on Linux.

Back to top