Submitter | phabricator |
---|---|
Date | Feb. 27, 2020, 4:39 p.m. |
Message ID | <9f64d81a57db08a37ddf31ac4ed64ecc@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/45366/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -413,14 +413,7 @@ Returns True if there appears to be mergestate. This is a rough proxy for "is a merge in progress." """ - # Check local variables before looking at filesystem for performance - # reasons. - return ( - bool(self._local) - or bool(self._state) - or self._repo.vfs.exists(self.statepathv1) - or self._repo.vfs.exists(self.statepathv2) - ) + return bool(self._local) or bool(self._state) def commit(self): """Write current state on disk (if necessary)"""