Last active
June 22, 2022 19:30
-
-
Save samsalisbury/5436108 to your computer and use it in GitHub Desktop.
Git diff and merge with p4merge (OSX)
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[merge] | |
keepBackup = false | |
tool = p4merge | |
[mergetool "p4merge"] | |
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\"" | |
keepTemporaries = false | |
trustExitCode = false | |
keepBackup = false | |
[diff] | |
tool = p4merge | |
[difftool "p4merge"] | |
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$REMOTE\"" "\"$LOCAL\"" |
I was finding that P4merge was leaving unwanted .orig
files behind
Adding the following config (to [mergetool]
on its own) stopped those files from being created
[mergetool]
keepBackup = false
Reference: https://stackoverflow.com/questions/1251681/git-mergetool-generates-unwanted-orig-files
[merge]
keepBackup = false
tool = p4merge
[mergetool "p4merge"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\""
keepTemporaries = false
trustExitCode = false
keepBackup = false
This is not working on Monterey. Any one get it working?
What error are you seeing @factiondavid ? I no longer use p4merge, and I'm not yet upgraded to Monterey, but if you post more information about what you're seeing I'm sure someone might be able to offer more help.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
It still works with P4Merge/2019.2/1904275. Config should be updated like jeff303 said.