Show More
@@ -193,7 +193,7 b' class _mergestate_base(object):' | |||||
193 | self._dirty = False |
|
193 | self._dirty = False | |
194 |
|
194 | |||
195 | def reset(self): |
|
195 | def reset(self): | |
196 | shutil.rmtree(self._repo.vfs.join(b'merge'), True) |
|
196 | pass | |
197 |
|
197 | |||
198 | def start(self, node, other, labels=None): |
|
198 | def start(self, node, other, labels=None): | |
199 | self._local = node |
|
199 | self._local = node |
General Comments 0
You need to be logged in to leave comments.
Login now