Created
February 21, 2017 04:36
-
-
Save JosephBlythe/96079fd3ad6541baad28b613428cd145 to your computer and use it in GitHub Desktop.
Source Tree Diff/Merge commands for PHPStorm OSX
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
| Visual Diff Tool: Custom... | |
| Diff Command: /Applications/PhpStorm\ 2016.3\ EAP.app/Contents/MacOS/phpstorm | |
| Arguments: diff $LOCAL $PWD/$REMOTE | |
| Merge Tool: Custom... | |
| Merge Command: /Applications/PhpStorm\ 2016.3\ EAP.app/Contents/MacOS/phpstorm | |
| Arguments: merge $PWD/$LOCAL $PWD/$REMOTE $PWD/$BASE $PWD/$MERGED | |
| Enjoy :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment