comparison mercurial/filemerge.py @ 43864:d5ce99a6db52

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 aa790f7c967a
comparison
equal deleted inserted replaced
43863:1ffbd03c8d75 43864:d5ce99a6db52
117 117
118 returns True if different from fctx. 118 returns True if different from fctx.
119 """ 119 """
120 return not ( 120 return not (
121 fctx.isabsent() 121 fctx.isabsent()
122 and fctx.ctx() == self.ctx() 122 and fctx.changectx() == self.changectx()
123 and fctx.path() == self.path() 123 and fctx.path() == self.path()
124 ) 124 )
125 125
126 def flags(self): 126 def flags(self):
127 return b'' 127 return b''