Guido van Rossum added the comment: 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 <gu...@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 <gu...@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. ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue24272> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
