Show More
@@ -276,7 +276,7 b' class DirstateItem(object):' | |||||
276 |
|
276 | |||
277 | Should only be set if a merge is in progress in the dirstate |
|
277 | Should only be set if a merge is in progress in the dirstate | |
278 | """ |
|
278 | """ | |
279 | return self.v1_state() == b'm' |
|
279 | return self._wc_tracked and self._merged | |
280 |
|
280 | |||
281 | @property |
|
281 | @property | |
282 | def from_p2(self): |
|
282 | def from_p2(self): |
General Comments 0
You need to be logged in to leave comments.
Login now