macOS: set p4merge as default merge tool
by admin on Oct.01, 2025, under News
One may install p4v (formerly p4merge) via this homebrew cask:
brew install --cask p4v
We may then set it as the default merge tool (for git merge) with the following commands:
git config --global merge.tool p4merge git config --global mergetool.p4merge.cmd "/Applications/p4merge.app/Contents/MacOS/p4merge \$BASE \$LOCAL \$REMOTE \$MERGED" git config --global mergetool.p4merge.trustExitCode true