mercurial/mergestate.py
changeset 45500 f2efc44213ec
parent 45499 19590b126764
child 45501 0e75c088f0dc
--- a/mercurial/mergestate.py	Tue Sep 15 16:10:16 2020 -0700
+++ b/mercurial/mergestate.py	Thu Sep 17 23:12:48 2020 -0700
@@ -193,7 +193,7 @@
         self._dirty = False
 
     def reset(self):
-        shutil.rmtree(self._repo.vfs.join(b'merge'), True)
+        pass
 
     def start(self, node, other, labels=None):
         self._local = node