# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2020-09-18 06:12:48
# Node ID f2efc44213ec4c85096b69a7862130828d50ebdd
# Parent  19590b126764ccdc4d5edbea35d0f7fd51bb2cbe

mergestate: make in-memory mergestate not clear on-disk mergestate on reset()

Oops, I thought I had remove the `rmtree()` call earlier. Maybe I
accidentally got it back in a histedit or something.

Differential Revision: https://phab.mercurial-scm.org/D9042

diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -193,7 +193,7 @@ class _mergestate_base(object):
         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