Item | Description |
---|---|
Use external diff tool | Select this checkbox to have PyCharm use an external tool for comparing files or folders. |
Path to executable | Web based annotation tool. In this field, specify the path to the executable file of the desired external diff tool. Use Browse , if necessary. This field is only available, when Use external diff tool checkbox is selected. |
Use by default | Select this checkbox to have PyCharm use the specified external tool for comparing files or folders by default. If this checkbox is not selected, PyCharm will use the built-in diff tool. To invoke an external tool, click the button 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. Note that different diff tools have different parameters. You need to specify all the necessary parameters in proper order. This field is only available, when Use external diff tool checkbox is selected. |
Use external merge tool | Select this checkbox to have PyCharm use an external merge tool. In the field below, specify the path to the executable file of the desired external tool. Use the Browse button , if necessary. |
Path to executable | In this field, specify the path to the executable file of the desired external merge tool. Use Browse , 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. Note that different merge tools have different parameters. You need to specify all the necessary parameters in proper order. This field is only available, when Use external merge tool checkbox is selected. |