External Diff Tools

Enable external diff tool

Select to use an external tool to compare files or folders.

Path to executable

Specify the path to the executable file of the external diff tool you want to use.

Parameters

Set the diff tool parameters.

Various diff tools have different parameters. You need to specify all the necessary parameters in the proper order:

• %1: left (local changes)

• %2: right (server changes)

• %3: base (the current version without the local changes)

Use by default

Select to use the specified external tool for comparing files or folders by default. Otherwise, PhpStorm will use the built-in diff tool. To invoke an external tool, click the button on the Differences viewer toolbar.

Enable external merge tool

Select to use an external merge tool.

Path to executable

Specify the path to the executable file of external merge tool you want to use.

Parameters

Set the merge tool parameters.

Various merge tools have different parameters. You need to specify all the necessary parameters in the proper order:

• %1: left (local changes)

• %2: right (server changes)

• %3: base (the current version without the local changes)

• %4: output (merge result)

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.