changeset 44434 | 2f290136b7d6 |
parent 44412 | edc8504bc26b |
child 44437 | 6a34e438461b |
--- a/relnotes/next Fri Jan 17 21:22:23 2020 +0300 +++ b/relnotes/next Fri Jan 24 15:28:37 2020 -0800 @@ -67,6 +67,9 @@ * The deprecated `ui.progress()` has now been deleted. Please use `ui.makeprogress()` instead. + * `hg.merge()` now takes a `ctx` instead of the previous `repo` and + `node` arguments. + * `hg.merge()` has lost its `abort` argument. Please call `hg.abortmerge()` directly instead.