Commits

Steve Losh committed bbc5193

Fix conflict marker regexes.

Comments (0)

Files changed (1)

autoload/threesomelib/modes.py

 
     def key_next(self):
         self.goto_result()
-        vim.command(r'exe "silent! normal! /\^\=\=\=\=\=\=\=\$\<cr>"')
+        vim.command(r'exe "silent! normal! /\\v^\\=\\=\\=\\=\\=\\=\\=*$\<cr>"')
 
     def key_prev(self):
         self.goto_result()
-        vim.command(r'exe "silent! normal! ?\^\=\=\=\=\=\=\=\$\<cr>"')
+        vim.command(r'exe "silent! normal! ?\\v^\\=\\=\\=\\=\\=\\=\\=*$\<cr>"')
 
 
     def open_hud(self, winnr):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.