diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py --- a/mercurial/mergestate.py +++ b/mercurial/mergestate.py @@ -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