Our great sponsors
-
diffview.nvim
Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
Diffview.nvim
-
Let me recommend https://github.com/cynix/vim-mergetool (fork of original tool by samoshkin). Has been a huge help for me
-
WorkOS
The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.
-
I highly recommend fugitive by tpope as u/SunnyNickname said. For me, it's probably one of my top 5 plugins I couldn't live without. As for the git merge, you can see it in action at http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/.
NOTE:
The number of mentions on this list indicates mentions on common posts plus user suggested alternatives.
Hence, a higher number means a more popular project.