]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b1a8b3 8a6ddb9)
merge 3.4 (#26046)
authorBenjamin Peterson <benjamin@python.org>
Fri, 8 Jan 2016 06:02:01 +0000 (22:02 -0800)
committerBenjamin Peterson <benjamin@python.org>
Fri, 8 Jan 2016 06:02:01 +0000 (22:02 -0800)
1  2 
Doc/library/unittest.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/unittest.rst
Simple merge
Mirror of https://github.com/python/cpython.git