changeset 18698:f2b1f78cf202 stable

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.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 15 Feb 2013 11:28:04 +0100
parents f6f35d646cb5
children 7d66a44e87ed
files contrib/mergetools.hgrc
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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