Mercurial > hg

view relnotes/next @ 48967:a54a866349ed stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: when merge tool uses $output, don't leave markers in $local As explained in the previous patch, we incorrectly leave conflict markers in both `$local` and `$output` since D12190. I don't understand why it broke but the fix is simple and clear after all the recent refactoring. Differential Revision: https://phab.mercurial-scm.org/D12379
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 15 Mar 2022 13:31:39 -0700
parents f0081a551f37
children a974c52fb79a
line wrap: on
line source

= Mercurial XXX =

== New Features ==

== Default Format Change ==

These changes affect newly created repositories (or new clones) done with
Mercurial XXX.

== New Experimental Features ==

== Bug Fixes ==

== Backwards Compatibility Changes ==

== Internal API Changes ==

== Miscellaneous ==