Skip to content

Instantly share code, notes, and snippets.

@scarabaeus

scarabaeus/p4merge-as-git-difftool.md

Created January 16, 2022 19:46
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

Download: P4Merge https://www.perforce.com/downloads/visual-merge-tool and only copy P4Merge to /Applications from the dmg.

~ $ git config --global diff.tool p4merge
~ $ git config --global difftool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge
~ $ git config --global difftool.prompt false

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