[torunar]

vimdiff, same as on Linux and Windows.

[bpmedley]

I also use vimdiff. It’s magic.

[sinsquare]

What is so great about it?

I do feel like I'm missing out on something here, but it's hard to quantify what it is.