PyCharm 2016.3 Help

External Diff Tools

File | Settings | Tools | Diff | External Diff Tools for Windows and Linux
PyCharm | Preferences | Tools | Diff | External Diff Tools for OS X
Ctrl+Alt+S
/help/img/idea/settings.png


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

ItemDescription
Use external diff toolSelect this check box to have PyCharm use an external tool for comparing files or folders.
Path to executableIn this text box, specify the path to the executable file of the desired external diff tool. Use the Browse button /help/img/idea/browseButton.png, if necessary.
This field is only available, when Use external diff tool check box is selected.
Use by defaultSelect this check box to have PyCharm use the specified external tool for comparing files or folders by default.
If this check box is not selected, PyCharm will use the built-in diff tool. To invoke an external tool, click the button /help/img/idea/external_tool.png on the toolbar of the Differences viewer.

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

ParametersUse this field to set the diff tool parameters.

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

Use external merge toolSelect this check box to have PyCharm 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 /help/img/idea/browseButton.png, if necessary.
Path to executableIn this text box, specify the path to the executable file of the desired external merge tool.
Use the Browse button /help/img/idea/browseButton.png, if necessary.
This field is only available, when Use external merge tool check box is selected.
ParametersUse this field to set the merge tool parameters.

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

See Also

Last modified: 23 November 2016