changeset 8312 | b87a50b7125c |
parent 8225 | 46293a0c7e9f |
child 8417 | 39cf453da958 |
--- a/mercurial/hg.py Thu May 07 15:08:25 2009 +0300 +++ b/mercurial/hg.py Tue Apr 28 17:40:46 2009 +0200 @@ -9,9 +9,10 @@ from i18n import _ from lock import release import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo -import errno, lock, os, shutil, util, extensions, error +import lock, util, extensions, error import merge as _merge import verify as _verify +import errno, os, shutil def _local(path): return (os.path.isfile(util.drop_scheme('file', path)) and