psi-jack/ultimate-vim
1
0
Fork 0
mirror of synced 2024-06-28 19:51:08 -04:00
Code Issues Releases Wiki Activity

resolve comflict

Browse source
This commit is contained in:
wangzheng 2018-10-14 21:59:37 +08:00
parent 6d4398077d 44dca49794
commit 166d5e7a61
4 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
my_plugins/.gitkeep Normal file
View file

27
sources_non_forked/vim-colors-solarized/doc/tags Normal file
View file

@ -0,0 +1,27 @@
'solarized_bold' solarized.txt /*'solarized_bold'*
'solarized_contrast' solarized.txt /*'solarized_contrast'*
'solarized_degrade' solarized.txt /*'solarized_degrade'*
'solarized_hitrail' solarized.txt /*'solarized_hitrail'*
'solarized_italic' solarized.txt /*'solarized_italic'*
'solarized_menu' solarized.txt /*'solarized_menu'*
'solarized_termcolors' solarized.txt /*'solarized_termcolors'*
'solarized_termtrans' solarized.txt /*'solarized_termtrans'*
'solarized_underline' solarized.txt /*'solarized_underline'*
'solarized_visibility' solarized.txt /*'solarized_visibility'*
before solarized.txt /*before*
solarized solarized.txt /*solarized*
solarized-colors solarized.txt /*solarized-colors*
solarized-colorscheme solarized.txt /*solarized-colorscheme*
solarized-help solarized.txt /*solarized-help*
solarized-install solarized.txt /*solarized-install*
solarized-menu solarized.txt /*solarized-menu*
solarized-options solarized.txt /*solarized-options*
solarized-term solarized.txt /*solarized-term*
solarized-togglebg solarized.txt /*solarized-togglebg*
solarized.vim solarized.txt /*solarized.vim*
toggle-background solarized.txt /*toggle-background*
toggle-bg solarized.txt /*toggle-bg*
togglebg solarized.txt /*togglebg*
urxvt solarized.txt /*urxvt*
vim-colors-solarized solarized.txt /*vim-colors-solarized*
without solarized.txt /*without*

1
temp_dirs/undodir/README.md Normal file
View file

@ -0,0 +1 @@
Undo dir for VIM

2
vimrcs/extended.vim
View file

@ -30,8 +30,6 @@ set guioptions-=L
" Colorscheme
set background=dark
colorscheme peaksea
"colorscheme solarized
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""