diff tests/test-simplemerge.py.out @ 29433:33770d2b6cf9

py3: conditionalize SocketServer import The SocketServer is renamed to socketserver in python 3
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 27 Jun 2016 16:48:54 +0530
parents f18830651811
children
line wrap: on
line diff