p4merge does not open files for diff

I've set up P4Merge in the preferences and, when I right-click a file in the staged window, Resolve Conflicts | Launch external Diff Tool opens P4Merge. However, all I get is a dialog that shows 'Details of files being merged' showing the two files, followed by a note that I'll have to QUIT my merge tool to complete the merge process, and an Abort button - nothing else.

I've seen comments about things being slow but I've not seen anyone say it just never starts up.

2 answers

SourceTree always shows the dialog you described when launching an external merge tool. P4Merge should open as a separate program. Is P4Merge not launching?

Have you independently installed P4Merge? The diff programs in the SourceTree options are NOT distributed with SourceTree.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

1,112 views 4 2
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