Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 41053:6faaf3a1c6ec
merge: modify the logical statement
Differential Revision: https://phab.mercurial-scm.org/D5476
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sun, 23 Dec 2018 13:16:25 +0530 |
| parents | 54c3b4bd01f2 |
| children | 8c222bec97da |
line wrap: on
line diff
--- 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()"""