equal
deleted
inserted
replaced
65 == Internal API Changes == |
65 == Internal API Changes == |
66 |
66 |
67 * The deprecated `ui.progress()` has now been deleted. Please use |
67 * The deprecated `ui.progress()` has now been deleted. Please use |
68 `ui.makeprogress()` instead. |
68 `ui.makeprogress()` instead. |
69 |
69 |
|
70 * `hg.merge()` now takes a `ctx` instead of the previous `repo` and |
|
71 `node` arguments. |
|
72 |
70 * `hg.merge()` has lost its `abort` argument. Please call |
73 * `hg.merge()` has lost its `abort` argument. Please call |
71 `hg.abortmerge()` directly instead. |
74 `hg.abortmerge()` directly instead. |
72 |
75 |
73 * `hg.merge()` has lost its `mergeforce` argument. It should have |
76 * `hg.merge()` has lost its `mergeforce` argument. It should have |
74 only ever been called with the same value as the `force` argument. |
77 only ever been called with the same value as the `force` argument. |