--- a/mercurial/merge.py Sun Jan 13 20:13:22 2019 -0500
+++ b/mercurial/merge.py Wed Feb 20 19:28:51 2019 -0500
@@ -391,9 +391,9 @@
"""
# 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) or
+ self._repo.vfs.exists(self.statepathv1) or
+ self._repo.vfs.exists(self.statepathv2))
def commit(self):
"""Write current state on disk (if necessary)"""