Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 7861:2bc14da14992

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: blacklist pythoncom win32com.shell would segfault at import time if pythoncom was demand loaded.
author Steve Borho <steve@borho.org>
date Mon, 09 Mar 2009 21:00:37 -0500
parents 89e05c02a4af
children 496ae1ea4698
line wrap: on
line diff