mirror of
https://github.com/amix/vimrc
synced 2025-07-26 22:45:00 +08:00
.
This commit is contained in:
3
sources_non_forked/vim-gitgutter/autoload/gitgutter/highlight.vim
Normal file → Executable file
3
sources_non_forked/vim-gitgutter/autoload/gitgutter/highlight.vim
Normal file → Executable file
@ -184,8 +184,6 @@ function! s:define_sign_line_highlights() abort
|
||||
endif
|
||||
endfunction
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
function! s:define_sign_linenr_highlights() abort
|
||||
if has('nvim-0.3.2')
|
||||
try
|
||||
@ -209,7 +207,6 @@ function! s:define_sign_linenr_highlights() abort
|
||||
endif
|
||||
endfunction
|
||||
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
function! s:get_hl(group, what, mode) abort
|
||||
let r = synIDattr(synIDtrans(hlID(a:group)), a:what, a:mode)
|
||||
if empty(r) || r == -1
|
||||
|
Reference in New Issue
Block a user