# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1320333310 14400
# Node ID bbc5193de145ba5334cf02693d959f475a3e850b
# Parent  33fc975d65e2965a3a2d3279e1e6b39be8933951
Fix conflict marker regexes.

diff -r 33fc975d65e2 -r bbc5193de145 autoload/threesomelib/modes.py
--- 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):