Skip to content

Instantly share code, notes, and snippets.

@stoe
Last active April 20, 2016 08:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save stoe/58b5b5880cb24f57a652 to your computer and use it in GitHub Desktop.
Save stoe/58b5b5880cb24f57a652 to your computer and use it in GitHub Desktop.
git-tower compare tools
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>ApplicationIdentifier</key>
<string>com.jetbrains.diff.webstorm</string>
<key>ApplicationName</key>
<string>WebStorm</string>
<key>DisplayName</key>
<string>WebStorm (DIFF)</string>
<key>LaunchScript</key>
<string>webstorm-diff.sh</string>
<key>Identifier</key>
<string>webstorm-diff</string>
<key>SupportsMergeTool</key>
<false/>
<key>SupportsDiffChangeset</key>
<true/>
</dict>
<dict>
<key>ApplicationIdentifier</key>
<string>com.jetbrains.merge.webstorm</string>
<key>ApplicationName</key>
<string>WebStorm</string>
<key>DisplayName</key>
<string>WebStorm (MERGE)</string>
<key>LaunchScript</key>
<string>webstorm-merge.sh</string>
<key>Identifier</key>
<string>webstorm-merge</string>
<key>SupportsMergeTool</key>
<true/>
<key>SupportsDiffChangeset</key>
<false/>
</dict>
</array>
</plist>
#!/bin/sh
CMD="$(which wstorm)"
"$CMD" diff "$1" "$2"
#!/bin/sh
CMD="$(which wstorm)"
"$CMD" merge "$1" "$2" "$3" "$4"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment