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

diff --git a/.vim/autoload/text.vim b/.vim/autoload/text.vim
index 8fe0e71..16e6c34 100644
--- a/.vim/autoload/text.vim
+++ b/.vim/autoload/text.vim
@@ -1,3 +1,11 @@
+function! text#SearchConflictMarkers()
+   normal /<<<<<<<\|=======\||||||||\|>>>>>>>
+endfunction
+
+function! text#RemoveTrailingSpaces()
+    %s/ \+$//
+endfunction
+
 function! text#SqueezeEmptyLines()
     " Replace multiple consecutive empty lines with just one
     %s/\n\{3,\}/\r\r/