Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [mergetool "intellij"]
- 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") \
- && read -n 1 -s
- [mergetool "vscode"]
- cmd = code --wait $MERGED
- [merge]
- tool = intellij
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement