[python-committers] [Python-checkins] cpython (merge 2.7 -> 2.7): merge heads.

[Martin Panter]

On 3 September 2015 at 10:03, Senthil Kumaran <senthil at uthcode.com> wrote:
> I did a merge head with Victor's change in 2.7 before pushing my change.
> Can someone confirm if I did it right? If anything was wrong, how to correct
> it?

It looks like you did it right. If I compare the merge result with the
second merge parent (Victor’s commits)

hg diff -p -r d687912d499f^2 -r d687912d499f

I get just your three-line diff to test_wsgiref.py, as I would expect.