Mercurial > hg

view relnotes/next @ 48559:b5e1283c0475

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: use same newline detection for :mergediff as for :merge[3] The `:merge` and `:merge3` markers used the newline style detected from the base input. The `:mergediff` style always used LF as newline character. This patch teaches `:mergediff` to use the same detection as the others did. Differential Revision: https://phab.mercurial-scm.org/D11976
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 07 Jan 2022 22:23:44 -0800
parents 28f0092ec89f
children 3c8cc987672e
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.

== Internal API Changes ==

The following functions have been removed:

Miscellaneous: