Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 4093:669f99f78db0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mail.py: don't try to use TLS if python doesn't have SSL support This should hide the traceback from issue501.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 16 Feb 2007 04:54:47 -0200
parents c0a12e6441a5
children 1e0b94cfba0e c95060a5391a
comparison
equal deleted inserted replaced
4092:4ced663bebf0 4093:669f99f78db0