equal
deleted
inserted
replaced
334 |
334 |
335 Should only be set if a merge is in progress in the dirstate |
335 Should only be set if a merge is in progress in the dirstate |
336 """ |
336 """ |
337 if not self._wc_tracked: |
337 if not self._wc_tracked: |
338 return False |
338 return False |
339 return self._clean_p2 or (not self._p1_tracked and self._p2_tracked) |
339 return self._clean_p2 |
340 |
340 |
341 @property |
341 @property |
342 def from_p2_removed(self): |
342 def from_p2_removed(self): |
343 """True if the file has been removed, but was "from_p2" initially |
343 """True if the file has been removed, but was "from_p2" initially |
344 |
344 |