PhpStorm.app (Standalone) Mac integration with Tower.app for diff and merge
- Add
CompareTools.plistandphpstorm.shfiles in the~/Library/Application Support/com.fournova.Tower3/CompareTools/directory. You may need tomkdir ~/Library/Application\ Support/com.fournova.Tower3/CompareToolsif the folder does not already exist - Run
chmod +x ~/Library/Application\ Support/com.fournova.Tower3/CompareTools/phpstorm.sh - Go into Tower.app Preference > Git Config > Select "PhpStorm" for "Diff tool" and "Compare tool", you can optionally enable "Perform directory diff"