Show More
@@ -286,7 +286,9 b' class DirstateItem(object):' | |||
|
286 | 286 | |
|
287 | 287 | Should only be set if a merge is in progress in the dirstate |
|
288 | 288 | """ |
|
289 |
|
|
|
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 | 293 | @property |
|
292 | 294 | def from_p2_removed(self): |
General Comments 0
You need to be logged in to leave comments.
Login now