Message250398
I suck at merge. :-( No idea what happened. To fix it, I have now just
copied the file again from the larry branch and committed that in 3.5, then
merged up to 3.6 (default).
changeset: 97856:8a7814a3613b
branch: 3.5
parent: 97847:6c8e2c6e3a99
user: Guido van Rossum <guido@python.org>
date: Thu Sep 10 10:52:11 2015 -0700
summary: Restore doc updates to typing.rst by Ivan Levkivskyi and
Daniel Andrade Groppe.
changeset: 97857:7fc4306d537b
tag: tip
parent: 97855:d433d74e0377
parent: 97856:8a7814a3613b
user: Guido van Rossum <guido@dropbox.com>
date: Thu Sep 10 10:54:10 2015 -0700
summary: Restore doc updates to typing.rst by Ivan Levkivskyi and
Daniel Andrade Groppe. |
|
Date |
User |
Action |
Args |
2015-09-10 17:56:19 | gvanrossum | set | recipients:
+ gvanrossum, larry, docs@python, Mark.Shannon, python-dev, berker.peksag, Daniel.Andrade.Groppe, levkivskyi |
2015-09-10 17:56:18 | gvanrossum | link | issue24272 messages |
2015-09-10 17:56:18 | gvanrossum | create | |
|