Fix conflict marker regexes.
    
        | author | Steve Losh <steve@stevelosh.com> | 
    
        | date | Thu, 03 Nov 2011 11:15:10 -0400 | 
    
    
        | parents | 33fc975d65e2 | 
    
        | children | c3f318a26db2 | 
    
        | branches/tags | (none) | 
    
        | files | autoload/threesomelib/modes.py | 
Changes
    
--- a/autoload/threesomelib/modes.py	Thu Nov 03 14:35:09 2011 +0000
+++ b/autoload/threesomelib/modes.py	Thu Nov 03 11:15:10 2011 -0400
@@ -108,11 +108,11 @@
 
     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):