Mercurial > hg

changeset 43846:d5ce99a6db52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix a missing attribute usage Flagged by both pytype and VSCode. Differential Revision: https://phab.mercurial-scm.org/D7465
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 20 Nov 2019 13:03:22 -0500
parents 1ffbd03c8d75
children 49fa0b31ee1d
files mercurial/filemerge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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()
         )