tomru/DotfilesOld
1
0
Fork 0
mirror of https://github.com/tomru/DotfilesOld.git synced 2026-03-04 15:07:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

add conflict marker plugin

Browse Source
This commit is contained in:
Thomas Ruoff
2016-07-25 22:39:51 +02:00
parent 9cf97c6354
commit 33ef0957ef
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vimrc
View File

@@ -33,6 +33,7 @@ Plug 'scrooloose/syntastic'
Plug 'pmsorhaindo/syntastic-local-eslint.vim' Plug 'pmsorhaindo/syntastic-local-eslint.vim'
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
Plug 'rhysd/conflict-marker.vim'
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'inside/vim-search-pulse' Plug 'inside/vim-search-pulse'