Use PHPStorm/WebStorm for git diff and merge tools

.gitconfig

# ~/.gitconfig
# Add this to your global git configuration file
# Change phpstorm to webstorm, if you use that.

# Diff and merge tool changes
# Run `git difftool <directory/file>...` or `git mergetool <directory/file>...`
[merge]
	tool = phpstorm
[diff]
	tool = phpstorm
[difftool]
; This setting is optional, but prevents an annoying prompt between diffing files.
	prompt = false
[difftool "phpstorm"]
; Putting this path here doesn't work. I would love to know why.
;	path = /Applications/PHPStorm.app/Contents/MacOS
	cmd = webide diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
	trustExitCode = true
[mergetool "phpstorm"]
	cmd = webide merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
	trustExitCode = true

.profile

# Add this to your .profile, .zshrc, .bashrc, etc.

# Add PHPStorm's bin directory to your path.
export PATH="/Applications/PHPStorm.app/Contents/MacOS:$PATH"

FYI: @zored I had to use && read instead on my system, in order for it to not delete the files before I'm done with them.
But that way, it works (for me too). Great work around, though! 👍 😉

P.S.: adding an additional --symlinks flag to the difftool --dir-diff is also a nice "upgrade"...