# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1545551185 -19800
# Node ID 6faaf3a1c6ec9342e45f6ebb506f823f8e578daf
# Parent  0214962773921f15333f11d97212b307422aaaf5
merge: modify the logical statement

Differential Revision: https://phab.mercurial-scm.org/D5476

diff -r 021496277392 -r 6faaf3a1c6ec mercurial/merge.py
--- 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()"""