]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 043e800 c0b1e0f)
Merge 3.4
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 20 Jul 2015 15:13:16 +0000 (17:13 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Mon, 20 Jul 2015 15:13:16 +0000 (17:13 +0200)
1  2 
Lib/test/test_os.py patch | diff1 | diff2 | blob | history

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