p4merge! Just `brew cask install p4v` and you're set. It supports viewing local, base and remote in three-way merges, which really helps when resolving conflict

p4merge! Just `brew cask install p4v` and you're set. It supports viewing local, base and remote in three-way merges, which really helps when resolving conflicts IMHO.