Comment by dummy_physicist

I use neovim as mergetool and some ad hoc diff tasks, but I'm glad to see meld on Mac. It is the tool I recommend when I see someone struggling with git rebase conflicts (and not using using vim).