[Python-Dev] cpython: Revert unintended merge

Steve Dower steve.dower at python.org
Sat Dec 3 18:58:37 EST 2016

On 03Dec2016 1519, Martin Panter wrote:
> This change comes from Matthias (Doko), and was originally only in the
> 3.5 branch:
> https://hg.python.org/cpython/rev/14c80065c36e
> I presume it was left unmerged until there is a branch for 3.6.1 to
> merge into. So Steve, when you did your first 3.5 → 3.6 merge, you
> merged Doko’s change into 3.6:
> https://hg.python.org/cpython/rev/5171bd86a36f

You're right. It didn't show up in my merge commit until I explicitly 
diffed against the previous version. I've reverted it in 3.6 as well.


More information about the Python-Dev mailing list