--- a/contrib/mergetools.hgrc	Tue Feb 12 22:15:31 2013 +0100
+++ b/contrib/mergetools.hgrc	Fri Feb 15 11:28:04 2013 +0100
@@ -15,7 +15,7 @@
 gvimdiff.regname=path
 gvimdiff.priority=-9
 
-vimdiff.args=$local $other $base
+vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl'
 vimdiff.check=changed
 vimdiff.priority=-10