Author: Armin Rigo <[email protected]>
Branch: py3.5-newtext
Changeset: r90152:d80fad7c1292
Date: 2017-02-15 14:18 +0100
http://bitbucket.org/pypy/pypy/changeset/d80fad7c1292/
Log: hg merge 7ae20dbc22fb
(note: I didn't review the very large number of conflicts, because I
*think* that in this exact case they should all resolve to nothing.
Indeed we're merging 7ae20dbc22fb, which is itself the merge of two
changesets that are already in my part history)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
