]> 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: 1a48b9d f575230)
Merge
authorMichael Foord <michael@voidspace.org.uk>
Mon, 18 Mar 2013 22:04:33 +0000 (15:04 -0700)
committerMichael Foord <michael@voidspace.org.uk>
Mon, 18 Mar 2013 22:04:33 +0000 (15:04 -0700)
1  2 
Doc/library/unittest.mock.rst patch | diff1 | diff2 | blob | history

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