# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1360924084 -3600
# Node ID f2b1f78cf202387486816a69431c23eeddc66e51
# Parent  f6f35d646cb5919997d3a23b942594def5d9e243
mergetools: vimdiff issue a warning explaining how to abort

Adds a message displayed at each vimdiff invocation:

  merge conflict detected, type ":cq" to abort

Vimdiff is very confusing for non-vim user (not to speak about vim user confused
anyway. However it is very likely that vimdiff is picked as the mergetool of
choice when using the default config:
- vim is available on all UNIX system.
- Its one of the rare non graphical merge tools.

diff -r f6f35d646cb5 -r f2b1f78cf202 contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Wed Feb 13 12:35:57 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