changeset 44398 | ddbc296a1f48 |
parent 44396 | acbfa31cfaf2 |
child 44412 | edc8504bc26b |
--- a/relnotes/next Wed Feb 26 10:54:17 2020 -0800 +++ b/relnotes/next Wed Feb 26 11:00:50 2020 -0800 @@ -65,5 +65,8 @@ * `hg.merge()` has lost its `abort` argument. Please call `hg.abortmerge()` directly instead. + * `hg.merge()` has lost its `mergeforce` argument. It should have + only ever been called with the same value as the `force` argument. + * The `*others` argument of `cmdutil.check_incompatible_arguments()` changed from being varargs argument to being a single collection.