I installed P4Merge and set is as default merge tool. Now this works from git bash - but not from SourceTree. Here just nothing noticeable happens if I click "Launch external merge tool" - although I set it also in the Sourcetree options....
P4Merge-Location: c:\Program Files\Perforce\
My config had these values:
cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
cmd = 'c:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe' /mine $LOCAL /theirs $REMOTE /base $BASE
trustExitCode = true
cmd = 'C:/Program
cmd = 'c:/Program
I removed those and now when I select P4Merge everything is fine (although slow).
I use P4Merge as both my diff and merge tool in SourceTree and select 'P4Merge' as the option in both drop-downs. 'System Default' basically uses whatever manual configuration you've created for the default difftool in your .gitconfig, whilst other items in the list add additional difftools called 'sourcetreediff' with generated configuration. Both ways work for me here, if you'd like us to investigate more please supply more details about the location of your P4Merge and post the contents of your .gitconfig.
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot