Advertisement
Guest User

Untitled

a guest
Oct 14th, 2019
73
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.41 KB | None | 0 0
  1. [mergetool "intellij"]
  2. cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm merge \
  3. $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") \
  4. $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") \
  5. $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") \
  6. $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED") \
  7. && read -n 1 -s
  8. [mergetool "vscode"]
  9. cmd = code --wait $MERGED
  10. [merge]
  11. tool = intellij
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement