[pypy-commit] pypy unicode-utf8: fix merge

Author: Matti Picus Branch: unicode-utf8 Changeset: r94459:ab5ac9802e14 Date: 2018-04-29 23:28 +0300 http://bitbucket.org/pypy/pypy/changeset/ab5ac9802e14/ Log:fix merge diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py --- a/pypy/module/_sre/interp_sre.py +++ b/py

[pypy-commit] pypy py3.5: merge default into py3.5

Author: Matti Picus Branch: py3.5 Changeset: r94457:8a3e586cc749 Date: 2018-04-29 20:56 +0300 http://bitbucket.org/pypy/pypy/changeset/8a3e586cc749/ Log:merge default into py3.5 diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -51,3 +51,5 @@

[pypy-commit] pypy unicode-utf8: merge default into branch

Author: Matti Picus Branch: unicode-utf8 Changeset: r94458:d4baff192be4 Date: 2018-04-29 21:18 +0300 http://bitbucket.org/pypy/pypy/changeset/d4baff192be4/ Log:merge default into branch diff too long, truncating to 2000 out of 11084 lines diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.