Mercurial > hg
view tests/README @ 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 | 1de6e7e1bb9f |
children | 4b0fc75f9403 |
line wrap: on
line source
To run the tests, do: cd tests/ python run-tests.py See http://mercurial.selenic.com/wiki/WritingTests for more information on writing tests.