Unknown merge tool sourcetree

Stéphane GREMLING

Hi,

I have a problem wih diff tool for Sourcetree on Windows

Version : 3.4.14

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

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

I have also cheked also my path or environment variables.

With GIT GUI i don't have this proglem.

Thanks.

Peepijeep

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])