.vim: Add `ConflictMarkersSearch()`

diff --git a/.vim/autoload/text.vim b/.vim/autoload/text.vim
index 87c7369246b5e2688d9646e0c2c891cc7c9ef0b2..64672d884d4c9bcc415b63c8e78b722aca451969 100644 (file)
--- a/.vim/autoload/text.vim
+++ b/.vim/autoload/text.vim
@@ -1,3 +1,7 @@
+function! text#ConflictMarkersSearch()
+   normal /<<<<<<<\|=======\||||||||\|>>>>>>>
+endfunction
+
 function! text#RemoveTrailingSpaces()
     %s/ \+$//
 endfunction