# install p4v tools
brew install --cask p4v
# configure git
git config --global diff.tool p4merge
git config --global difftool.p4merge.path /Applications/p4merge.app/Contents/Resources/launchp4merge
git config --global difftool.prompt false
git config --global merge.tool p4merge
git config --global mergetool.p4merge.path /Applications/p4merge.app/Contents/Resources/launchp4merge
git config --global mergetool.prompt false
# disable unwanted orig files
git config --global mergetool.keepBackup false
# test
git difftool HEAD^ HEAD
Last active
June 30, 2024 16:18
-
-
Save avoidik/a9b8a75dbe6ffa6b765e1567234eb6f5 to your computer and use it in GitHub Desktop.
p4merge as git diff tool on macos
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
if you're getting checksum mismatch error similar to
then we have to update sha256 checksum