Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/filemerge.py
changeset 43846 d5ce99a6db52
parent 43845 1ffbd03c8d75
child 44872 aa790f7c967a 
--- 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()
         )
mercurial