Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

p4merge does not open files for diff

Jeffrey Love
Jeffrey Love June 30, 2015

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.

Answer
Watch
Like Be the first to like this
489 views

2 answers

0 votes
Seth
Seth
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
Get recognized
June 30, 2015

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

Reply
0 votes
Seth
Seth
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
Get recognized
June 30, 2015

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

Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

    See all events