# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1360962403 21600
# Node ID ec9b9968b7f84ac2de4722ed22a313868f84f6bc
# Parent  6a012704c841db7d6c018b916465fab961610544
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.

diff -r 6a012704c841 -r ec9b9968b7f8 contrib/mergetools.hgrc
--- 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