Commits

Steve Losh  committed e3cad92

Don't explode when running \n or \N when there are no conflicts left.

  • Participants
  • Parent commits 5ed1d3c

Comments (0)

Files changed (1)

File autoload/threesomelib/modes.py

 
     def key_next(self):
         self.goto_result()
-        vim.command(r'exe "normal! /\=\=\=\=\=\=\=\<cr>"')
+        vim.command(r'exe "silent! normal! /\=\=\=\=\=\=\=\<cr>"')
 
     def key_prev(self):
         self.goto_result()
-        vim.command(r'exe "normal! ?\=\=\=\=\=\=\=\<cr>"')
+        vim.command(r'exe "silent! normal! ?\=\=\=\=\=\=\=\<cr>"')
 
 
     def open_hud(self, winnr):