X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vim%2Fautoload%2Ftext.vim;h=16e6c343004eed899ce231e103e66aeeaaf01fe6;hb=30db78e1dbb83ed3025f5378d4a83e5e5441da4e;hp=87c7369246b5e2688d9646e0c2c891cc7c9ef0b2;hpb=45f6f88668a9578f87a6b1520e61070f425053fa;p=dotfiles.git

diff --git a/.vim/autoload/text.vim b/.vim/autoload/text.vim
index 87c7369..16e6c34 100644
--- a/.vim/autoload/text.vim
+++ b/.vim/autoload/text.vim
@@ -1,3 +1,7 @@
+function! text#SearchConflictMarkers()
+   normal /<<<<<<<\|=======\||||||||\|>>>>>>>
+endfunction
+
 function! text#RemoveTrailingSpaces()
     %s/ \+$//
 endfunction