OSX Big Sur, difftool and mergetool working configuration

[Milan Lazarevic]

I have tried installing Meld on Sur with release 3.21.0. This is what I had to add to .gitconfig file in order for mergetool and difftool to start working:

[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args "$LOCAL" "$PWD/$REMOTE"
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge "$PWD/$LOCAL" "$PWD/$BASE" "$PWD/$REMOTE" --output="$PWD/$MERGED"