# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1159570259 18000
# Node ID 9e002614f2eb6961b4c7352d13d2e9e0c544505a
# Parent  05c588e1803dc96b29913f81a0878414eb274f0c
merge: minor nullid cleanup

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -380,7 +380,7 @@ def update(repo, node, branchmerge=False
         p1, p2 = p2, repo.changectx(nullid)
 
     xp1, xp2 = str(p1), str(p2)
-    if p2.node() == nullid: xp2 = ''
+    if not p2: xp2 = ''
 
     repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)