PHP Enable IntelliJ dialogs on Mac OS X Note: This is no longer necessary in PhpStorm 8. IntelliJ uses it’s own dialogs by default. I recently ran into an issue using the merge tool in PhpStorm 7.1 on OS