The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

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

Preset wrong path of DiffMerge(Mac)

hpyer
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!
February 22, 2022

When set `Diff Tool` and `Merge Tool` to DiffMerge, the APP will update `~/.gitconfig` with the following config:

 

[difftool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --nosplash \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"

 

But the correct path of DiffMerge is: `/Applications/DiffMerge.app/Contents/MacOS/DiffMerge`

 

Sourcetree: 4.1.5(241)

MacOS: 10.15.7

1 answer

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes
Dan Smith
November 8, 2025

I also have this problem in SourceTree 4.2.14 on macOS 15.7.1.

Manually edited the path but after restarting SourceTree the wrong path is back. Will try a different merge tool.

TAGS
AUG Leaders

Atlassian Community Events