mercurial/filemerge.py

--- a/mercurial/filemerge.py	Mon Apr 19 20:38:52 2021 -0400
+++ b/mercurial/filemerge.py	Mon Mar 29 01:52:06 2021 +0200
@@ -15,7 +15,6 @@
 from .i18n import _
 from .node import (
     hex,
-    nullid,
     short,
 )
 from .pycompat import (
@@ -111,7 +110,7 @@
         return None
 
     def filenode(self):
-        return nullid
+        return self._ctx.repo().nullid
 
     _customcmp = True