Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 3876: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	Tue Dec 12 17:52:33 2006 -0600
+++ b/mercurial/merge.py	Tue Dec 12 18:16:23 2006 -0600
@@ -441,6 +441,9 @@
     wlock = working dir lock, if already held
     """
 
+    if node is None:
+        node = "tip"
+
     if not wlock:
         wlock = repo.wlock()