equal
deleted
inserted
replaced
298 return self.removed and self._clean_p2 |
298 return self.removed and self._clean_p2 |
299 |
299 |
300 @property |
300 @property |
301 def removed(self): |
301 def removed(self): |
302 """True if the file has been removed""" |
302 """True if the file has been removed""" |
303 return self.v1_state() == b'r' |
303 return not self._wc_tracked and (self._p1_tracked or self._p2_tracked) |
304 |
304 |
305 @property |
305 @property |
306 def merged_removed(self): |
306 def merged_removed(self): |
307 """True if the file has been removed, but was "merged" initially |
307 """True if the file has been removed, but was "merged" initially |
308 |
308 |