##// END OF EJS Templates
dirstate-item: implement `merged_removed` in a simpler way...
marmoute -
r48746:f94cc63d default
parent child Browse files
Show More
@@ -309,7 +309,7 b' class DirstateItem(object):'
309 This property seems like an abstraction leakage and should probably be
309 This property seems like an abstraction leakage and should probably be
310 dealt in this class (or maybe the dirstatemap) directly.
310 dealt in this class (or maybe the dirstatemap) directly.
311 """
311 """
312 return self.v1_state() == b'r' and self.v1_size() == NONNORMAL
312 return self.removed and self._merged
313
313
314 @property
314 @property
315 def dm_nonnormal(self):
315 def dm_nonnormal(self):
General Comments 0
You need to be logged in to leave comments. Login now