gistfile1.txt

distutils pypy $ git merge master
Auto-merging util.py
CONFLICT (content): Merge conflict in util.py
Auto-merging unixccompiler.py
CONFLICT (content): Merge conflict in unixccompiler.py
Auto-merging tests/test_upload.py
CONFLICT (content): Merge conflict in tests/test_upload.py
Auto-merging tests/test_spawn.py
CONFLICT (content): Merge conflict in tests/test_spawn.py
Auto-merging tests/test_msvccompiler.py
CONFLICT (content): Merge conflict in tests/test_msvccompiler.py
Auto-merging tests/test_dist.py
Auto-merging tests/test_build_ext.py
CONFLICT (content): Merge conflict in tests/test_build_ext.py
Auto-merging tests/test_bdist_wininst.py
CONFLICT (content): Merge conflict in tests/test_bdist_wininst.py
Auto-merging tests/test_bdist.py
CONFLICT (content): Merge conflict in tests/test_bdist.py
Auto-merging sysconfig.py
CONFLICT (content): Merge conflict in sysconfig.py
Auto-merging spawn.py
CONFLICT (content): Merge conflict in spawn.py
Auto-merging msvccompiler.py
Auto-merging msvc9compiler.py
CONFLICT (content): Merge conflict in msvc9compiler.py
Auto-merging cygwinccompiler.py
Auto-merging command/upload.py
Auto-merging command/sdist.py
Auto-merging command/install.py
Auto-merging command/check.py
Auto-merging command/build_ext.py
CONFLICT (content): Merge conflict in command/build_ext.py
Auto-merging command/bdist_wininst.py
CONFLICT (content): Merge conflict in command/bdist_wininst.py
Auto-merging command/bdist_rpm.py
Auto-merging command/bdist_msi.py
Auto-merging archive_util.py
CONFLICT (content): Merge conflict in archive_util.py
Auto-merging _msvccompiler.py
CONFLICT (content): Merge conflict in _msvccompiler.py
Automatic merge failed; fix conflicts and then commit the result.