diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 6fe330a..e187fc5 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -38,6 +38,7 @@ Plug 'junegunn/gv.vim' Plug 'rhysd/git-messenger.vim' Plug 'christoomey/vim-conflicted' Plug 'rbong/vim-flog' +Plug 'whiteinge/diffconflicts' " For tmux yank Plug 'vim-utils/vim-husk' " Tags