How to intergate P4Merge with Sourcetree under Windows?

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....

3 answers

1 accepted

Accepted Answer
0 votes

P4Merge-Location: c:\Program Files\Perforce\

My config had these values:

[difftool "sourcetree"]
cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
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).

It seems that in this case you have to choose "System default". Then P4Merge is opened correctly (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.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

977 views 2 3
Read article

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you