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

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events