Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3887:79e5a6e7c451
Merge with main
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 14 Dec 2006 13:49:33 -0800 |
parents | abaee83ce0a6 |
children | 6b4127c7d52a |
line wrap: on
line diff
--- 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 @@ -441,6 +440,9 @@ def update(repo, node, branchmerge, forc wlock = working dir lock, if already held """ + if node is None: + node = "tip" + if not wlock: wlock = repo.wlock()