Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

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

Rufus Reh
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
March 8, 2019

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
Rufus Reh
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
March 10, 2019

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

0 votes
Mike Corsaro
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 8, 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?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events