Mercurial > hg

comparison mercurial/merge.py @ 29576:d5067913f97b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hghave: add test for Python 2.7+ Setting ciphers in the ssl module requires Python 2.7. Surprisingly, we didn't have a test for running on Python 2.7.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 17 Jul 2016 10:50:51 -0700
parents 1e4512eac59e
children b33c0c38d68f
comparison
equal deleted inserted replaced
29575:1cc5a918b7d8 29576:d5067913f97b