Mercurial > hg
view relnotes/next @ 44176:6744859ff3ee
merge: call hg.abortmerge() directly and return early
It's seem really weird to go through a lot of unrelated code before we
call `hg.merge(..., abort=True)` when we can just call
`hg.abortmerge()` and return early.
Differential Revision: https://phab.mercurial-scm.org/D7995
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 24 Jan 2020 16:05:11 -0800 |
parents | df2162672d24 |
children | bd4f666b55a7 |
line wrap: on
line source
== New Features == == New Experimental Features == == Bug Fixes == == Backwards Compatibility Changes == == Internal API Changes == * The deprecated `ui.progress()` has now been deleted. Please use `ui.makeprogress()` instead.