]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6f1d16 31a7835)
#17504: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 24 Mar 2013 14:10:51 +0000 (16:10 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 24 Mar 2013 14:10:51 +0000 (16:10 +0200)
1  2 
Lib/unittest/mock.py patch | diff1 | diff2 | blob | history

diff --cc Lib/unittest/mock.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.