mercurial/merge.py
changeset 41050 6faaf3a1c6ec
parent 41039 54c3b4bd01f2
child 41155 8c222bec97da
--- a/mercurial/merge.py	Sun Dec 23 01:05:20 2018 -0500
+++ b/mercurial/merge.py	Sun Dec 23 13:16:25 2018 +0530
@@ -1538,8 +1538,8 @@
     unresolvedcount = attr.ib()
 
     def isempty(self):
-        return (not self.updatedcount and not self.mergedcount
-                and not self.removedcount and not self.unresolvedcount)
+        return not (self.updatedcount or self.mergedcount
+                    or self.removedcount or self.unresolvedcount)
 
 def emptyactions():
     """create an actions dict, to be populated and passed to applyupdates()"""