view relnotes/next @ 48548:88a45330b290

simplemerge: rewrite `merge_lines()` using `merge_groups()` Simple is better. Differential Revision: https://phab.mercurial-scm.org/D11967
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 05 Jan 2022 11:34:54 -0800
parents 4d59e0f909e0
children 28f0092ec89f
line wrap: on
line source

== New Features ==


== Default Format Change ==

These changes affects newly created repositories (or new clone) done with
Mercurial XXX.


== New Experimental Features ==

== Bug Fixes ==

The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`.

== Backwards Compatibility Changes ==


== Internal API Changes ==

The following functions have been removed:

Miscellaneous: