Submitter | phabricator |
---|---|
Date | Dec. 11, 2019, 6:30 p.m. |
Message ID | <6f24c7661e5dcc9ac31eba8ecbe57aa0@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/43725/ |
State | Not Applicable |
Headers | show |
Comments
Patch
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() )