Last active
April 20, 2016 08:21
-
-
Save stoe/58b5b5880cb24f57a652 to your computer and use it in GitHub Desktop.
git-tower compare tools
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
<?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> |
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
#!/bin/sh | |
CMD="$(which wstorm)" | |
"$CMD" diff "$1" "$2" |
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
#!/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