Commits

Steve Losh committed bbc5193

Fix conflict marker regexes.

  • Participants
  • Parent commits 33fc975

Comments (0)

Files changed (1)

File 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):