Mercurial > public > mercurial-scm > hg-stable
diff relnotes/next @ 44253:bd4f666b55a7
merge: drop now-unused "abort" argument from hg.merge()
Differential Revision: https://phab.mercurial-scm.org/D7997
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 24 Jan 2020 16:07:42 -0800 |
| parents | df2162672d24 |
| children | d4c1501225c4 |
line wrap: on
line diff
--- a/relnotes/next Fri Jan 24 17:49:21 2020 -0800 +++ b/relnotes/next Fri Jan 24 16:07:42 2020 -0800 @@ -14,3 +14,6 @@ * The deprecated `ui.progress()` has now been deleted. Please use `ui.makeprogress()` instead. + + * `hg.merge()` has lost its `abort` argument. Please call + `hg.abortmerge()` directly instead.