diff -r ad878e3f282b -r 728d89f6f9b1 mercurial/mergestate.py
--- a/mercurial/mergestate.py	Tue Mar 30 02:33:12 2021 +0200
+++ b/mercurial/mergestate.py	Tue Mar 30 02:32:30 2021 +0200
@@ -11,6 +11,7 @@
     hex,
     nullhex,
     nullid,
+    nullrev,
 )
 from . import (
     error,
@@ -341,7 +342,7 @@
         flo = fco.flags()
         fla = fca.flags()
         if b'x' in flags + flo + fla and b'l' not in flags + flo + fla:
-            if fca.node() == nullid and flags != flo:
+            if fca.rev() == nullrev and flags != flo:
                 if preresolve:
                     self._repo.ui.warn(
                         _(