IntelliJ IDEA 2019.1 Help

External Diff Tools

File | Settings | Tools | Diff & Merge | External Diff Tools for Windows and Linux
IntelliJ IDEA | Preferences | Tools | Diff & Merge | External Diff Tools for macOS
Ctrl+Alt+S the Settings/Preferences icon


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

Item

Description

Use external diff tool

Select this checkbox to have IntelliJ IDEA use an external tool for comparing files or folders.

Path to executable

In this text box, specify the path to the executable file of the desired external diff tool. Use Browse browseButton, if necessary.
This field is only available, when Use external diff tool checkbox is selected.

Use by default

Select this checkbox to have IntelliJ IDEA use the specified external tool for comparing files or folders by default.
If this checkbox is not selected, IntelliJ IDEA will use the built-in diff tool. To invoke an external tool, click the button icons general externalToolsSmall on the toolbar of the Differences viewer.

This field is only available, when Use external diff tool checkbox is selected.

Parameters

Use this field to set the diff tool parameters.

This field is only available, when Use external diff tool checkbox is selected.

Use external merge tool

Select this checkbox to have IntelliJ IDEA use an external merge tool. In the text box below, specify the path to the executable file of the desired external tool. Use the Browse button browseButton, if necessary.

Path to executable

In this text box, specify the path to the executable file of the desired external merge tool.
Use Browse browseButton, if necessary.
This field is only available, when Use external merge tool checkbox is selected.

Parameters

Use this field to set the merge tool parameters.

This field is only available, when Use external merge tool checkbox is selected.

Last modified: 20 June 2019

See Also