diff hgext/transplant.py @ 46027:1d5189a57405 stable 5.6.1

rebase: clear merge state when aborting in-memory merge on dirty working copy Differential Revision: https://phab.mercurial-scm.org/D9509
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 02 Dec 2020 15:39:01 -0800
parents c1b603cdc95a
children 527ce85c2e60
line wrap: on
line diff