Created
June 15, 2017 13:24
-
-
Save kraihn/0793dda5877ed1e709be4b4a5c85ef33 to your computer and use it in GitHub Desktop.
WebStorm as Git mergetool
This file contains 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 = webstorm | |
| [mergetool "webstorm"] | |
| cmd = cmd.exe //c "\"FULL_PATH_TO-->/webstorm.bat" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"\" | |
| trustExitCode = true | |
| [diff] | |
| tool = webstorm | |
| [difftool "webstorm"] | |
| cmd = cmd.exe //c "\"FULL_PATH_TO-->/webstorm.bat" diff \"$LOCAL\" \"$REMOTE\"\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The path must be to the .bat file, and this can alternatively be used with IntelliJ Community Edition.