Created
July 5, 2021 05:34
-
-
Save steelx/a0d38d3d0c6c8a50b4444f7bf849c9a9 to your computer and use it in GitHub Desktop.
Use Webstorm as diff and merge tool in Vscode
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
[user] | |
name = Ajinkya | |
email = [email protected] | |
[core] | |
autocrlf = input | |
[url "[email protected]:"] | |
insteadOf = https://github.com/ | |
[diff] | |
tool = webstorm | |
[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 = 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] | |
tool = webstorm |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment