aboutsummaryrefslogtreecommitdiff
path: root/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/init.vim1
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5345657..8facb45 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -75,6 +75,7 @@ Plug 'tikhomirov/vim-glsl'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'ryanoasis/vim-devicons' "Icons for filetypes
Plug 'puremourning/vimspector'
+Plug 'samoshkin/vim-mergetool'
" themes
Plug 'arzg/vim-colors-xcode'