Mercurial > hg > mercurial-source

comparison mercurial/merge.py @ 30193:34b914ac573e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: conditionalize xmlrpclib import The xmlrpclib library is renamed to xmlrpc.client in python 3
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 27 Jun 2016 16:37:37 +0530
parents 0d83ad967bf8
children 1e4512eac59e
comparison
equal deleted inserted replaced
30192:80880ad3fccd 30193:34b914ac573e