From 947da1b68e72dffb2df50837b1361e344691b0c9 Mon Sep 17 00:00:00 2001 From: Guillermo Kuster Date: Mon, 12 Jul 2021 23:19:33 -0400 Subject: [PATCH] fix messy rebase --- vimrcs/basic.vim | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index dcae8f1..42088b8 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -56,11 +56,7 @@ set mouse=a """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => VIM user interface """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -<<<<<<< HEAD " Set 5 lines to the cursor - when moving vertically using j/k -======= -" Set 7 lines to the cursor - when moving vertically using j/k ->>>>>>> wip set so=5 " Avoid garbled characters in Chinese language windows OS @@ -110,35 +106,17 @@ set ttyfast " Don't redraw while executing macros (good performance config) set lazyredraw -<<<<<<< HEAD -<<<<<<< HEAD " set cursorline -======= ->>>>>>> wip -======= -" set cursorline - ->>>>>>> Preparing everything to move from Tmux + Vimux to Kitty + mykitten + " This selects the default regexp engine. |two-engines| " The possible values are: " 0 automatic selection " 1 old engine " 2 NFA engine -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Preparing everything to move from Tmux + Vimux to Kitty + mykitten + " set regexpengine=0 " Faster redraw for ruby files " autocmd FileType ruby setlocal regexpengine=1 -<<<<<<< HEAD -======= -set regexpengine=1 ->>>>>>> wip -======= ->>>>>>> Preparing everything to move from Tmux + Vimux to Kitty + mykitten + " For regular expressions turn magic on set magic