#Ediff, #Emacs tool for comparing and merging versions of a text file, is pretty neat. Worth actually reading the manual and learning its features. Can be a huge time-saver.
@tmalsburg Sounds nice! But probably not worth learning #emacs as a #vi user?! 😉
@abulling I started with Vim but switched to Emacs after 10 years because of elisp and the vast ecosystem of extension packages. Never regretted it.

@tmalsburg
I actually also used #emacs for a while.

But then tried #vi and later #vim and now my setup is so personalised and familiar that switching would be a huge step.

And I'd only consider it if vim was fundamentally lacking in some critical feature. Which it is not (for me).

Not sure what the equivalent to ediff would be...

@abulling Vim is far from the worst editor to be stuck with. And both communities did a pretty good job absorbing the most important ideas from the respective other best editor. When I started with Emacs, one killer feature was org mode and later came magit. The rest is nice-to-have, easy to replicate, or copied from Vim in the first place.