diff hgext/convert/filemap.py @ 45511:f2efc44213ec

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
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Sep 2020 23:12:48 -0700
parents 649d3ac37a12
children 89a2afe31e82
line wrap: on
line diff