Created
August 4, 2015 23:46
-
-
Save stoe/c380fc174d8345740dab to your computer and use it in GitHub Desktop.
WebStorm DiffMerge
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
| [mergetool] | |
| keepBackup = false | |
| [merge] | |
| tool = wstorm | |
| [mergetool "wstorm"] | |
| 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 | |
| [difftool] | |
| prompt = false | |
| [diff] | |
| tool = wstorm | |
| [difftool "wstorm"] | |
| cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this to
~/.gitconfigto use WebStorm as a diff- and mergetool.Usage:
git difftoolgit mergetool