##// END OF EJS Templates
dirstate-item: implement `from_p2` in a simpler way...
marmoute -
r48743:7033d1d5 default
parent child Browse files
Show More
@@ -286,7 +286,7 b' class DirstateItem(object):'
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.v1_state() == b'n' and self.v1_size() == FROM_P2
289 return self._wc_tracked and self._clean_p2
290
290
291 @property
291 @property
292 def from_p2_removed(self):
292 def from_p2_removed(self):
General Comments 0
You need to be logged in to leave comments. Login now