DataGrip 2020.2 Help

External Diff Tools

File | Settings | Tools | Diff & Merge | External Diff Tools for Windows and Linux

DataGrip | Preferences | Tools | Diff & Merge | External Diff Tools for macOS

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

ItemDescription
Enable external diff toolSelect to use an external tool to compare files or folders.
Path to executableSpecify the path to the executable file of the external diff tool you want to use.
Parameters

Set the diff tool parameters.

Use by defaultSelect 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 toolSelect to use an external merge tool.
Path to executableSpecify the path to the executable file of external merge tool you want to use.
ParametersSet 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: 19 August 2020