Mercurial > hg
view tests/test-doctest.py @ 17422:93bc65e970c0 stable
mergetools.hgrc: set vimdiff to check=changed
The standard reaction in from of unexpected vimdiff is to ":quit". This will
make vimdiff return a 0 status even if no merge were done at all.
This change detect that nothing have been changed in vimdiff as a potential
unresolved conflict.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 02 Aug 2012 13:51:49 +0200 |
parents | db68ee3289b6 |
children | 0d5a22f73a1f |
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) 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)