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; } } }

External diff/merge tool does not launch

85e72acf18064

After update to 3.1.3 version of sourcetree I can't launch external diff/merge tool.

I've tried everything that I could find, but it didn't help much.

I use IntelliJ IDEA tool and set it as follows in Tools -> Options -> Diff -> External Diff/Merge section:

.gitconfig file:

[diff]
tool = sourcetree
[difftool "sourcetree"]
cmd = 'C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe' diff $LOCAL $REMOTE
[merge]
tool = sourcetree
[mergetool "sourcetree"]
cmd = 'C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe' merge $LOCAL $REMOTE $BASE $MERGED
trustExitCode = true

When I try to launch external diff tool by RMC -> External Diff in Process Viewer I see the following:

But when I use git command line:

press Enter and the tool is opening.

Do anybody know what to do with that?

UPDATE

I've tried to change diff/merge tools to another one but error was the same. I've tried to find all gitconfig files and Total Commander gave me few:

I noticed that when I change anything in tools > Options none of the gitconfig files are changed and it looks like SourceTree stores settings in a different file.

My setting from the Git tab are:

I've tried to reinstall SourceTree - did't help

Accepted answers

85e72acf18064

The problem was because of HOMESHARE system environment...

In this topic I found that SourceTree uses the following rules to locate your global git config:

HOME, if defined in the global Windows environment (NOT in .profile or similar, only Bash sees that)
HOMEDRIVE + HOMEPATH as a first fallback
USERPROFILE as a last resort

My HOME variable had a nonexistent path. Although my USERPROFILE varibale was ok the SourceTree didn't want to look for .gitconfig file int it.

All comments

Mike Corsaro

Hello! I think this might be caused by the .gitconfig being configured for the system-wide git rather than embedded git. Could you try switching from embedded git to system git under Options > Git (or verify it's already using system git)?

85e72acf18064

Hi, thanks for reply! I've tried switch to embedded git, try use extrenal diff, then back to System git and it didn't help. I've updated my question.

Off-top: It's strange that the latest version from official site is 3.1.2 that wants to update to 3.1.3 after install

85e72acf18064

deleted

Mike Corsaro

Could you check if the setting "Allow Sourcetree to modify your global Git and Mercurial config files" is checked under "Options > General"?

85e72acf18064

The problem was because of HOMESHARE system environment...

In this topic I found that SourceTree uses the following rules to locate your global git config:

HOME, if defined in the global Windows environment (NOT in .profile or similar, only Bash sees that)
HOMEDRIVE + HOMEPATH as a first fallback
USERPROFILE as a last resort

My HOME variable had a nonexistent path. Although my USERPROFILE varibale was ok the SourceTree didn't want to look for .gitconfig file int it.

G B_llhukk

In windows 7 external diff suddenly stopped working for no apparent reason.

I upgraded to 3.2.6 to no avail.

In the end it were the wrong quotes (replace ' by ") in the .gitconfig file in my home dir (cd ~ in terminal)

wrong .gitconfig file:

[diff]
tool = sourcetree
[difftool "sourcetree"]
cmd = 'C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe' diff $LOCAL $REMOTE

Correct .gitconfig file (see the usage of " instead of ' at the cmd lines:

[diff]
tool = sourcetree
[difftool "sourcetree"]
cmd = "C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe" diff $LOCAL $REMOTE

Martin Egholm

Still a solution today 👍

Nikhil Agrawal_ghylcr

I'm having the same issues. My fix was in my .gitconfig file. The path to my diff tool wasn't set correctly for some reason.

Welcome!

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

Quick Links

Find more posts tagged with

sourcetree

merge

diff