From patchwork Fri Feb 15 21:12:12 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [STABLE] mergetools: vimdiff issue a warning explaining how to abort
From: Kevin Bullock <kbullock+mercurial@ringworld.org>
X-Patchwork-Id: 1014
Message-Id: <6677AE59-247C-47A6-82E1-D2AAEB8CC69D@ringworld.org>
To: Matt Mackall <mpm@selenic.com>
Cc: Pierre-Yves David <pierre-yves.david@logilab.fr>,
 Mercurial Development <mercurial-devel@selenic.com>
Date: Fri, 15 Feb 2013 15:12:12 -0600


diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -15,7 +15,7 @@ gvimdiff.regkeyalt=Software\Wow6432Node\
 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