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.
Have you independently installed P4Merge? The diff programs in the SourceTree options are NOT distributed with SourceTree.
SourceTree always shows the dialog you described when launching an external merge tool. P4Merge should open as a separate program. Is P4Merge not launching?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.