nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

P4Merge diff doesn't show up

mangotamu

Hi, this is Minku.

I have downloaded P4Merge and SourceTree 3.0.17.2659 on my 64-bit Windows 10 laptop.

diff config.png The W looking thing is a WON currency. It is shown like this because I'm using a Korean-based laptop.

https://superuser.com/questions/787664/why-are-backslashes-displayed-as-%E2%82%A9-korean-won-sign-w-strikethrough-in-not

However, after I click the "external diff", nothing happened.

How can I launch P4Merge and compare files?

-Thanks for the help, MInku

Accepted answers

All comments

Mike Corsaro

Hello! Could you post a part of your ".git" config file for me? You can find it under "C:\Users\USERNAME_HERE\.git"

Please post the part under "[difftool "sourcetree"]"

Thanks!

minnsey

Hi

It is possible this is a bug, we have a fixed some in this area in the upcoming 3.1, but can you check the contents of your git config, it should look like

difftool.sourcetree.cmd='C:/Program Files/Perforce/p4merge.exe' "$LOCAL" "$REMOTE"
mergetool.sourcetree.cmd='C:/Program Files/Perforce/p4merge.exe' "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
mergetool.sourcetree.trustexitcode=true

Also in the Tools/Options/Diff tab I would expect to see the path to the P4 .exe

mangotamu

Hi, Mike.

[difftool "sourcetree"]
cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true

When I opened it, it was shown like the above picture.

But still, P4Merge doesn't show up when I choose "External Diff".

mangotamu

Hi, Michael. I'm using P4Merge and SourceTree 3.0.17.2659 on my 64-bit Windows 10 laptop.

Mine is configured as

But still, P4Merge doesn't show up when I choose "External Diff".

I wish to get your help.

minnsey

That looks correct.

Is there anything in the Event Viewer or %localappdata%/Atlassian/Sourcetree/Sourcetree.log indicating an error?

Also if you try installing an alternative like kdiff3 and configuring that does it start working?

mangotamu

Hi, Michael

"Also if you try installing an alternative like kdiff3 and configuring that does it start working?"

I installed the KDiff3 64-bit. This works when I press Ctrl+D.

Here's what I found. My Scenario:

Set the Diff tool to KDiff3. Then execute Ctrl+D and we will see it is working.

The KDiff3 really pops up fast that it didn't took a second. I'm testing this with a laptop that has i3 processor and SSD, BTW.

Now go back to settings and choose P4Merge.

Surprisingly, compared to the case when I choose KDiff3, if I choose P4Merge, it shows a blank on the Diff Command. Anyways, I pressed Okay.

NOW, when I press Ctrl+D, P4Merge pops up.

But it took like 3.5 seconds and I noticed the green progress bar. This bar doesn't always appear after pressing Ctrl+D.

So I thought everything was solved. However, after I turn off SourceTree and run it again, P4Merge doesn't show up when I press Ctrl+D.

In contrast, when I have a merge conflict, P4Merge does pop up when I try to solve the conflict with the external diff tool.

Can you guys try this as well and see if this is re-generatable on your side?

-Thanks

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

p4merge

diff