# HG changeset patch # User Steve Losh # Date 1309472166 14400 # Node ID e3cad92631fb4b8b7f2173a7330b4fc2ac6a53f6 # Parent 5ed1d3cd606d01dcbf68f14c4ec761af37249ac8 Don't explode when running \n or \N when there are no conflicts left. diff -r 5ed1d3cd606d -r e3cad92631fb autoload/threesomelib/modes.py --- a/autoload/threesomelib/modes.py Thu Jun 30 15:06:09 2011 -0400 +++ b/autoload/threesomelib/modes.py Thu Jun 30 18:16:06 2011 -0400 @@ -108,11 +108,11 @@ def key_next(self): self.goto_result() - vim.command(r'exe "normal! /\=\=\=\=\=\=\=\"') + vim.command(r'exe "silent! normal! /\=\=\=\=\=\=\=\"') def key_prev(self): self.goto_result() - vim.command(r'exe "normal! ?\=\=\=\=\=\=\=\"') + vim.command(r'exe "silent! normal! ?\=\=\=\=\=\=\=\"') def open_hud(self, winnr):