~/.gitconfig tip not working on Monterrey

[elg0nz]

The .gitconfig in

meld/index.html

Lines 63 to 80 in 0c2902e

	Once installed, edit your <code>~/.gitconfig</code> and add the following lines</p>
	<pre><code>[diff]
	tool = meld
	[difftool]
	prompt = false
	[difftool "meld"]
	trustExitCode = true
	cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
	[merge]
	tool = meld
	[mergetool]
	prompt = false
	[mergetool "meld"]
	trustExitCode = true
	cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
	</code></pre>
	</blockquote>

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

[danmichaelo]

See #128 , the recommendation in that issue also works in Monterey