Neovim

tl;dr: Neovim has come a long way from an experimental vim fork that it was at inception and is veritably, in my opinion, the hotbed for open source editor innovation currently. However customising it can feel daunting especially since things are changing rapidly. Having lived through vi vs emacs I was a full on emacs person jumping through my ocaml code with the venerable tuareg mode which is loved and maintained to this day. At that time, vim support for ocaml didn’t exist, thus emacs came out on top for me. ...

(screenshot taken from diffview.nvim repository) Over the years, I’ve gone through so many merge tools - kdiff3, meld, beyond compare, Kaleidoscope. Nvim being my editor of choice, fortunately, has a rich ecosystem of plugins where I can set up an uber merge workflow using diffview.nvim and avoid using external tools altogether. Getting started Make sure you have the latest nvim installed (I have v0.10.4). Although I use lazyvim as the base to provide the basic (and some advanced) editor features, I have to set recourse to diffview.nvim to ease my merging process. ...