[nfoz]

I just use `vimdiff`, but this looks better.

[Brian_K_White]

Same. I mean... vim, right there already for free, and the invocation is rather ridiculously simpler.

And vimdiff is even an editor not just a viewer.

Now if it was say, Meld in a terminal, that would be worth talking about and I installing some stack as a dependency.

[gnufx]

Bad luck! Emacs Ediff worked well for me before Git, and it still does (frequently in a tty, and preferably not with Git).