3 ms·

I'm in the same boat as you. There was something about integrating SM, but I couldn't get it to work. There are two decent open source choices IMO. Meld Merge

I'm in the same boat as you. There was something about integrating SM, but I couldn't get it to work. There are two decent open source choices IMO. Meld Merge (https://meldmerge.org/ https://meldmerge.org/) is my favourite, due to being cross-platform. Works well for merging, and `git difftool -d`. Although I cannot get it to run decently on macOS nowadays :( WinMerge (https://winmerge.org/ https://winmerge.org/) is also good, but Windows only.

geoelectric 6y ago
The custom Mac builds the Meld site points you at work ok for me on Catalina. The biggest issue is there’s no proper command line utility on Mac for some reason, but the person maintaining the unofficial Mac fork documents an incantation that’ll work for git difftool, using open and Meld.app.