# HG changeset patch # User Matt Harbison # Date 1574273002 18000 # Node ID d5ce99a6db52a858ea850206af39886dc597ab11 # Parent 1ffbd03c8d75ef35ca8172a2879b464227d43b08 filemerge: fix a missing attribute usage Flagged by both pytype and VSCode. Differential Revision: https://phab.mercurial-scm.org/D7465 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() )