D7465: filemerge: fix a missing attribute usage
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Wed Dec 11 13:30:25 EST 2019
Closed by commit rHGd5ce99a6db52: filemerge: fix a missing attribute usage (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7465?vs=18415&id=18620
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7465/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7465
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -119,7 +119,7 @@
"""
return not (
fctx.isabsent()
- and fctx.ctx() == self.ctx()
+ and fctx.changectx() == self.changectx()
and fctx.path() == self.path()
)
To: mharbison72, #hg-reviewers, dlax
Cc: dlax, mercurial-devel
More information about the Mercurial-devel
mailing list