DataGrip 2022.1 Help

External Diff Tools

If necessary, specify external tools for comparing files and folders, and associated settings.

Item

Description

Enable external diff tool

Select to use an external tool to compare files or folders.

Path to executable

Specify the path to the executable file of the external diff tool you want to use.

Parameters

Set the diff tool parameters.

Use by default

Select to use the specified external tool for comparing files or folders by default. Otherwise, DataGrip will use the built-in diff tool. To invoke an external tool, click the External tools button on the Differences viewer toolbar.

Enable external merge tool

Select to use an external merge tool.

Path to executable

Specify the path to the executable file of external merge tool you want to use.

Parameters

Set the merge tool parameters.

Trust process exist code

Select to silently finish the merge if the exitCode of the external merge tool is set to 0 (successful). Otherwise, you will be prompted to indicate the success of the resolution after the tool has exited.

Last modified: 07 April 2022