Mercurial > hg
view tests/test-doctest.py @ 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 | 0d5a22f73a1f |
children | f01ae031f84c |
line wrap: on
line source
# this is hack to make sure no escape characters are inserted into the output import os if 'TERM' in os.environ: del os.environ['TERM'] import doctest import mercurial.util doctest.testmod(mercurial.util) # Only run doctests for the current platform doctest.testmod(mercurial.util.platform) import mercurial.changelog doctest.testmod(mercurial.changelog) import mercurial.dagparser doctest.testmod(mercurial.dagparser, optionflags=doctest.NORMALIZE_WHITESPACE) import mercurial.match doctest.testmod(mercurial.match) import mercurial.store doctest.testmod(mercurial.store) import mercurial.ui doctest.testmod(mercurial.ui) import mercurial.url doctest.testmod(mercurial.url) import mercurial.encoding doctest.testmod(mercurial.encoding) import mercurial.hgweb.hgwebdir_mod doctest.testmod(mercurial.hgweb.hgwebdir_mod) import hgext.convert.cvsps doctest.testmod(hgext.convert.cvsps) import mercurial.revset doctest.testmod(mercurial.revset) import mercurial.minirst doctest.testmod(mercurial.minirst) import mercurial.templatefilters doctest.testmod(mercurial.templatefilters)