Last active
June 22, 2017 11:23
-
-
Save artemsky/a77e04d221dc6c9d6c3acb17ab4903e5 to your computer and use it in GitHub Desktop.
Phpstrom mergetool with git cli
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [merge] | |
| tool = phpstorm | |
| [mergetool "phpstorm"] | |
| cmd = 'C:/Program Files/JetBrains/PhpStorm 2017.1.4/bin/phpstorm64.exe' merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED") | |
| trustExitCode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment