changeset 3886 | abaee83ce0a6 |
parent 3885 | 1e0b94cfba0e |
child 3893 | 6b4127c7d52a |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -7,8 +7,7 @@ from node import * from i18n import gettext as _ -from demandload import * -demandload(globals(), "errno util os tempfile") +import errno, util, os, tempfile def filemerge(repo, fw, fo, wctx, mctx): """perform a 3-way merge in the working directory