Show More
@@ -268,7 +268,7 b' class DirstateItem(object):' | |||||
268 | @property |
|
268 | @property | |
269 | def added(self): |
|
269 | def added(self): | |
270 | """True if the file has been added""" |
|
270 | """True if the file has been added""" | |
271 | return self.v1_state() == b'a' |
|
271 | return self._wc_tracked and not (self._p1_tracked or self._p2_tracked) | |
272 |
|
272 | |||
273 | @property |
|
273 | @property | |
274 | def merged(self): |
|
274 | def merged(self): |
General Comments 0
You need to be logged in to leave comments.
Login now