changeset 18699:7d66a44e87ed stable

mergetools: refine vimdiff warning message We explicitly redraw before echoing the message so that it simply displays at the bottom of the window. Also simplifies the message printing by using 'echomsg' (which uses 'echohl' internally) and adds the names of the software involved for improved Googleability.
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 15 Feb 2013 15:06:43 -0600
parents f2b1f78cf202
children 4a85ebb5c807 61c8327ced50
files contrib/mergetools.hgrc
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/mergetools.hgrc	Fri Feb 15 11:28:04 2013 +0100
+++ b/contrib/mergetools.hgrc	Fri Feb 15 15:06:43 2013 -0600
@@ -15,7 +15,7 @@
 gvimdiff.regname=path
 gvimdiff.priority=-9
 
-vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl'
+vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
 vimdiff.check=changed
 vimdiff.priority=-10