equal
deleted
inserted
replaced
63 `ui.makeprogress()` instead. |
63 `ui.makeprogress()` instead. |
64 |
64 |
65 * `hg.merge()` has lost its `abort` argument. Please call |
65 * `hg.merge()` has lost its `abort` argument. Please call |
66 `hg.abortmerge()` directly instead. |
66 `hg.abortmerge()` directly instead. |
67 |
67 |
|
68 * `hg.merge()` has lost its `mergeforce` argument. It should have |
|
69 only ever been called with the same value as the `force` argument. |
|
70 |
68 * The `*others` argument of `cmdutil.check_incompatible_arguments()` |
71 * The `*others` argument of `cmdutil.check_incompatible_arguments()` |
69 changed from being varargs argument to being a single collection. |
72 changed from being varargs argument to being a single collection. |