equal
deleted
inserted
replaced
284 |
284 |
285 This is only True is the file is currently tracked. |
285 This is only True is the file is currently tracked. |
286 |
286 |
287 Should only be set if a merge is in progress in the dirstate |
287 Should only be set if a merge is in progress in the dirstate |
288 """ |
288 """ |
289 return self._wc_tracked and self._clean_p2 |
289 if not self._wc_tracked: |
|
290 return False |
|
291 return self._clean_p2 or (not self._p1_tracked and self._p2_tracked) |
290 |
292 |
291 @property |
293 @property |
292 def from_p2_removed(self): |
294 def from_p2_removed(self): |
293 """True if the file has been removed, but was "from_p2" initially |
295 """True if the file has been removed, but was "from_p2" initially |
294 |
296 |