Skip to content

Instantly share code, notes, and snippets.

@scarabaeus

scarabaeus/p4merge-as-git-difftool.md

Last active January 31, 2025 21:10
Show Gist options
  • Save scarabaeus/3b4a618283dfa06e3e88de6d30883c61 to your computer and use it in GitHub Desktop.
Save scarabaeus/3b4a618283dfa06e3e88de6d30883c61 to your computer and use it in GitHub Desktop.
Download ZIP
Setting p4merge as default git difftool
Raw
p4merge-as-git-difftool.md

Setting up P4Merge as the default difftool for Git

  1. Download P4Merge for your operating system: https://www.perforce.com/downloads/visual-merge-tool
  2. Run the .dmg file that you just downloaded.
  3. Copy only the P4Merge app to your /Applications folder. (Unless you want the other apps as well.)
  4. Run the following lines in terminal:
git config --global diff.tool p4merge
git config --global difftool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge
git config --global difftool.prompt false

Debugging:

macOS

  • If you receive the error message: qt.qpa.fonts: Populating font family aliases took N ms. Replace uses of missing font family "Courier" with one that exists to avoid this cost. run git difftool and in P4Merge > Preferences... > Text Format > Font replace "Courier" with "Consolas".
@scarabaeus
Copy link
Author

FYI: I don't like using P4Merge as the merge tool, just as the diff tool.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment