[pypy-commit] pypy reflowing: hg merge default

2016-11-25 Thread rlamy
Author: Ronan Lamy Branch: reflowing Changeset: r88676:a7f16e7b539a Date: 2016-11-25 18:55 + http://bitbucket.org/pypy/pypy/changeset/a7f16e7b539a/ Log:hg merge default diff too long, truncating to 2000 out of 2919 lines diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-pyt

[pypy-commit] pypy reflowing: hg merge default

2016-11-24 Thread rlamy
Author: Ronan Lamy Branch: reflowing Changeset: r88645:9b3564c820ef Date: 2016-11-24 06:07 + http://bitbucket.org/pypy/pypy/changeset/9b3564c820ef/ Log:hg merge default diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py --- a/pypy/interpreter/argument.py +++ b/pypy/