Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Unknown merge tool sourcetree

Hi,

I have a problem wih diff tool for Sourcetree on Windows

Version : 3.4.14

2023-08-24_13h03_33.png

When i aks to compare with External diff (CTRL-D), nothing happens.

And when i check the log process viewer,i have an error.

2023-08-24_13h06_25.png

I have also cheked also my path or environment variables.

With GIT GUI i don't have this proglem.

Thanks.

2 answers

1 accepted

0 votes
Answer accepted

Looks like SourceTree can't write into your .gitconfig file when saving options.

The .gitconfig file is under C:\Users\[Your User].

Git can't write it because maybe a environment variable is not set correctly.

You can add following content into your .gitconfig (maybe adjusting the paths)

[difftool "sourcetree"]
cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = "'' "
trustExitCode = true

Imagine that there may be no empty lines in your .gitconfig.

Or you can setup sourcetree so it can write in your .gitconfig file again.

Check what values following environment variable have:   %HOMEDRIVE%%HOMEPATH%

You can do that by opening cmd and typing in

echo  %HOMEDRIVE%%HOMEPATH%




this should show your user folder on C:\Users\[Your User]

If not, it can be that your company or administrator changed that variable to something else.

To fix the problem (without changing the existing variables), you can create a new environment variable called "HOME" and set it to %USERPROFILE%

 

setx HOME %USERPROFILE%



So %HOME% will show on the same folder as %USERPROFILE% (which should be C:\Users\[Your User])

It's ok for me after contacted my compagny adminstrateur.

Now my %HOMEDRIVE% is trageting the good drive.

Thanks a lot.

I also have the same problem. I am using the emedded Git of sourceTree. I installed WinMerge, but I cant open it via SourceTree.


WinMerge.png

When using extermal diff, I get same error: "Unknown merge tool sourcetree".

I hope somebody can help us.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events