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

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,457,003
Community Members
 
Community Events
176
Community Groups

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

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 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?

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events