rebase: remove bogus nullmerge check in updatebookmarks

nstate[v] is a node, not an int, and the nullmerge check was done while
building nstate anyway.

hgext/rebase.py

@@ -498,9 +498,8 b' def updatebookmarks(repo, nstate, origin'
     marks = repo._bookmarks
     for k, v in originalbookmarks.iteritems():
         if v in nstate:
-            if nstate[v] > nullmerge:
-                # update the bookmarks for revs that have moved
-                marks[k] = nstate[v]
+            # update the bookmarks for revs that have moved
+            marks[k] = nstate[v]
 
     marks.write()