Mercurial > hg

view relnotes/next @ 48590:7e503eff3c76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 13:23:49 -0800
parents 3c8cc987672e
children b128d21cbe8b
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 ==

The remotefilelog extension now requires an appropiate excludepattern
for subrepositories.

The labels passed to merge tools have changed slightly. Merge tools can get
labels passed to them if you include `$labellocal`, `$labelbase`, and/or
`$labelother` in the `merge-tool.<tool name>.args` configuration. These labels
used to have some space-padding, and truncation to fit within 72 columns. Both
the padding and the truncation has been removed.

== Internal API Changes ==

The following functions have been removed:

Miscellaneous: