diff -r 1ffbd03c8d75 -r d5ce99a6db52 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Wed Nov 20 13:01:56 2019 -0500
+++ b/mercurial/filemerge.py	Wed Nov 20 13:03:22 2019 -0500
@@ -119,7 +119,7 @@
         """
         return not (
             fctx.isabsent()
-            and fctx.ctx() == self.ctx()
+            and fctx.changectx() == self.changectx()
             and fctx.path() == self.path()
         )