This is an archive of the discontinued Mercurial Phabricator instance.

rebase: clear merge state when aborting in-memory merge on dirty working copy
ClosedPublic

Authored by martinvonz on Dec 2 2020, 6:46 PM.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 2 2020, 6:46 PM
mharbison72 accepted this revision.Dec 3 2020, 1:27 AM
mharbison72 added a subscriber: mharbison72.

Queued, thanks. I got a fuzz 1 (offset 0 lines) message when I applied the first one, so please double check it.

This revision is now accepted and ready to land.Dec 3 2020, 1:27 AM
baymax updated this revision to Diff 23987.Dec 3 2020, 2:37 AM

Queued, thanks. I got a fuzz 1 (offset 0 lines) message when I applied the first one, so please double check it.

Looks good, thanks.