[Python-checkins] cpython (merge 3.4 -> 3.4): merge

[Terry Reedy]

On 9/27/2015 10:35 PM, alexander.belopolsky wrote:
> https://hg.python.org/cpython/rev/1ae0e02b541d
> changeset:   98340:1ae0e02b541d
> branch:      3.4
> parent:      98338:cbcf82f92c25
> parent:      98334:ff68705c56a8
> user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
> date:        Sun Sep 27 22:34:07 2015 -0400
> summary:
>    merge

This 3.4 - 3.4 merge was not merged forward.  When it is, there will be 
merge conflicts.  When I failed to notice, committed to 3.4, and 
attempted to 3.5, I was asked to resolve your merge conflicts.  Perhaps 
you want them null-merged, but I don't know for sure.  So I reverted 
before pushing to get the 2.7 commit in.