diff tests/test-check-code.t @ 30697:13d94304c8da

merge with stable
author Augie Fackler <augie@google.com>
date Wed, 04 Jan 2017 14:52:59 -0500
parents 5861bdbeb9a3
children 8a17c541177f
line wrap: on
line diff
--- a/tests/test-check-code.t	Tue Jan 03 13:25:29 2017 +0100
+++ b/tests/test-check-code.t	Wed Jan 04 14:52:59 2017 -0500
@@ -10,7 +10,7 @@
   $ hg locate -X contrib/python-zstandard -X hgext/fsmonitor/pywatchman |
   > sed 's-\\-/-g' | xargs "$check_code" --warnings --per-file=0 || false
   Skipping i18n/polib.py it has no-che?k-code (glob)
-  mercurial/demandimport.py:309:
+  mercurial/demandimport.py:312:
    >     if os.environ.get('HGDEMANDIMPORT') != 'disable':
    use encoding.environ instead (py3)
   mercurial/encoding.py:54: