Git Mergetool

Spent a while the other day trying to figure out what to use for a Git Diff and Git Merge tool.

Settled on Kdiff3. With this install approach:

brew cask install

From Stack Overflow. And also from SO, the config:

To ~/.git/config add:

    tool = kdiff3

Now $ git mergetool brings up a useful dialogue.

I had tried Beyond Compare as well as Meld, but neither worked.

I got into it because I was checking out a couple of approaches to updating Trellis for a particular project: