-
-
Save samsalisbury/5436108 to your computer and use it in GitHub Desktop.
[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\"" |
It stopped working on MacOS Mojave for me :( Please help.
p4merge just opens without files chosen.
I am also getting the segmentation fault issue on Mojave 10.14.5.
It still works with P4Merge/2019.2/1904275. Config should be updated like jeff303 said.
[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
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge "\"$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.
@jeff303 googling for the same issue led me to your comment.
It looks like
launchp4merge
does not like running witout any arguments.If I run
launchp4merge
to diff two files and just close the diff window, everything is fine. (even Cmd-Q works)If I run
launchp4merge
without any arguments and also don't choose any files to diff after it launches, then a segfault happens.