[Updated] D12085: relnotes: add note about changed labels texts

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHGb128d21cbe8b: relnotes: add note about changed labels texts (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12085?vs=31822&id=31839

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12085/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12085

AFFECTED FILES
  relnotes/next

CHANGE DETAILS

diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -24,6 +24,11 @@
 used to have some space-padding, and truncation to fit within 72 columns. Both
 the padding and the truncation has been removed.
 
+Some of the text in labels passed to merge tools has changed. For example,
+in conflicts while running `hg histedit`, the labels used to be "local",
+"base", and "histedit". They are now "already edited",
+"parent of current change", and "current change", respectively.
+
 == Internal API Changes ==
 
 The following functions have been removed:



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220124/3ab3db19/attachment-0002.html>