External Diff Tools
File | Settings | Tools | Diff & Merge | External Diff Tools for Windows and Linux
IntelliJ IDEA | Settings | Tools | Diff & Merge | External Diff Tools for macOS
CtrlAlt0S
Specify external tools for comparing or merging files and folders, and associated settings.

Item | Description |
---|---|
Enable external tools | Select to use an external tool to compare or merge files or folders. |
Configure external tools | |
Add a new external tool. In the dialog the opens, configure the following options:
![]() | |
Remove the selected external tool. | |
Edit the settings of the selected external tool. | |
Configure external diff/merge tools associated with a file type | |
Add a file type and configure the diff and external tool that will be used to process files of this type. | |
Remove the selected association between a file type and an external diff or merge tool. |
Thanks for your feedback!