Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3885:1e0b94cfba0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove deprecated old-style branch support
author Matt Mackall <mpm@selenic.com>
date Tue, 12 Dec 2006 18:16:23 -0600
parents c0a12e6441a5
children abaee83ce0a6
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -441,6 +441,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()