Show More
@@ -747,6 +747,13 b' class basefilectx(object):' | |||
|
747 | 747 | def islink(self): |
|
748 | 748 | return 'l' in self.flags() |
|
749 | 749 | |
|
750 | def isabsent(self): | |
|
751 | """whether this filectx represents a file not in self._changectx | |
|
752 | ||
|
753 | This is mainly for merge code to detect change/delete conflicts. This is | |
|
754 | expected to be True for all subclasses of basectx.""" | |
|
755 | return False | |
|
756 | ||
|
750 | 757 | _customcmp = False |
|
751 | 758 | def cmp(self, fctx): |
|
752 | 759 | """compare with other file context |
General Comments 0
You need to be logged in to leave comments.
Login now