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

SourceTree 3.0.8 removes mergetool and difftool settings in .gitconfig

Hi, everytime I close SourceTree, it removes the mergetool and difftool settings from my .gitconfig file. This also happens when I start the application and immediately close it afterwards. This results in SemanticMerge not being available as external diff/merge tool.

My .gitconfig looks like this:

name = User
email =
[mergetool "sourcetree"]
cmd = 'C:/Users/myusername/AppData/Local/semanticmerge/semanticmergetool.exe' -s \"$REMOTE\" -d \"$LOCAL\" -b \"$BASE\" -r \"$MERGED\"
trustExitCode = true
[difftool "sourcetree"]
cmd = 'C:/Users/myusername/AppData/Local/semanticmerge/semanticmergetool.exe' -s \"$LOCAL\" -d \"$REMOTE\"
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f

Could you please check? Thanks

2 answers

I've also been seeing this recently. Every time I try to resolve a merge conflict it fails as the P4Merge path has been reset and I have to abort, go to Sourcetree settings, specify the path to P4Merge and restart to try again. Super frustrating

Suggest an answer

Log in or Sign up to answer
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,907 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