On Wed, Feb 2, 2022, at 11:57 PM, brian m. carlson wrote: > This definitely doesn't sound like the expected behavior here. It's not > clear to me why this is happening, but it probably shouldn't be. It > doesn't appear that we fail to call the config callback, since we've > been doing that since 2010. > > What version of Git are you using that's not working? Initially noticed on v2.30.2, but you can reproduce it to similar effect on v2.35.0 (ie. add an invalid "merge.conflictStyle" value like "fizzbuzz" to ~/.gitconfig, and a valid one like "diff3" to a file pulled in via "include.path", and you'll see the same behavior). Cheers, Greg
