Created
April 22, 2020 11:09
-
-
Save gko/ede57b883ea3b6f93c7db2568892df36 to your computer and use it in GitHub Desktop.
webstorm as merge and difftool for git
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
| [difftool "webstorm"] | |
| cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm diff $(cd $(dirname \"$LOCAL\") && pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") && pwd)/$(basename \"$REMOTE\") | |
| trustExitCode = true | |
| [mergetool "webstorm"] | |
| cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm 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 | |
| [merge] | |
| keepBackup = false | |
| tool = webstorm | |
| [diff] | |
| tool = webstorm |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment