Mercurial > hg

diff tests/test-merge-criss-cross.t @ 29433:33770d2b6cf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6b1fc09c699a
children 72c36a2be2d6
line wrap: on
line diff