Browse merge tool

I wanted to use WinMerge as a merge tool in ST.
When i get to Tools > Options > Diff and selected WinMerge i got the ability to browse for the exe.

I then remembered that i forgot to install WinMerge on my computer so i clicked cancel.
Now when the merge tool is installed i am not able to get the browse window again.

How do i change the merge tool for ST manually? 

1 answer

SourceTree stores that info in the git configuration. For me (Windows 10), it is in C:\Users\username\.gitconfig

I would recommend having SourceTree shut down while editing that file.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

561 views 1 2
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you