It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Launch External Merge Tool always launches "Visual Merge" instead of KDiff3

although the settings for KDiff3 are properly done:

.gitconfig:

[merge]
 tool = sourcetree
[diff]
 tool = sourcetree
:::
[difftool "sourcetree"]
 cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
 cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
 trustExitCode = true

 

Selecting the DIFF action for a file launches Kdiff3.exe!

Seems that SourceTree does not read the value from .gitconfig for mergetool or uses a default because something is still wrong with the mergetool cmd?!? 

OS: Windows

Any idea?

Thanks

2 answers

0 votes
Mike Corsaro Atlassian Team Mar 08, 2019

Hmmm... maybe I'm misunderstanding, but those settings values are correct? The config says "launch kdiff3" and kdiff3 is launched, right? What is the tool you're expecting to be launched?

Hi Mike,

almost right. The settings are configured for KDiff3 for both Diff Tool AND Merge Tool.

But as Merge Tool always "Visual Merge" is launched instead of KDiff3.

For Diff Tool the configured KDiff3 is launched.

Question: Why is "Visual Merge" launched as Merge Tool although KDiff3 is configured properly?

Thanks

Rufus

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,902 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you