meld
meld copied to clipboard
~/.gitconfig tip not working on Monterrey
The .gitconfig in https://github.com/yousseb/meld/blob/0c2902e367bb1f9d69948b2e01076416418e11f6/index.html#L63-L80 did not work for me in macOS Monterrey 12.3.1.
The bug that I'm seeing with the config above, is that $LOCAL keeps pointing to the wrong file.
eg /.circleci/.config
instead of $PWD/.circleci/.config
The config below, however, works great, so I'm wondering if it would be a better option :) I only have tested it on Monterrey, but afaik it should work with previous MacOS versions
[difftool]
prompt = false
[difftool "meld"]
path = /Applications/Meld.app/Contents/MacOS/Meld
[mergetool]
prompt = false
[mergetool "meld"]
trustExitCode = true
path = /Applications/Meld.app/Contents/MacOS/Meld
See #128 , the recommendation in that issue also works in Monterey