equal
deleted
inserted
replaced
169 self._state = {} |
169 self._state = {} |
170 self._stateextras = {} |
170 self._stateextras = {} |
171 self._local = None |
171 self._local = None |
172 self._other = None |
172 self._other = None |
173 self._labels = labels |
173 self._labels = labels |
174 for var in (b'localctx', b'otherctx'): |
174 for var in ('localctx', 'otherctx'): |
175 if var in vars(self): |
175 if var in vars(self): |
176 delattr(self, var) |
176 delattr(self, var) |
177 if node: |
177 if node: |
178 self._local = node |
178 self._local = node |
179 self._other = other |
179 self._other = other |
194 """ |
194 """ |
195 self._state = {} |
195 self._state = {} |
196 self._stateextras = {} |
196 self._stateextras = {} |
197 self._local = None |
197 self._local = None |
198 self._other = None |
198 self._other = None |
199 for var in (b'localctx', b'otherctx'): |
199 for var in ('localctx', 'otherctx'): |
200 if var in vars(self): |
200 if var in vars(self): |
201 delattr(self, var) |
201 delattr(self, var) |
202 self._readmergedriver = None |
202 self._readmergedriver = None |
203 self._mdstate = MERGE_DRIVER_STATE_SUCCESS |
203 self._mdstate = MERGE_DRIVER_STATE_SUCCESS |
204 unsupported = set() |
204 unsupported = set() |