# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2022-01-24 16:35:14
# Node ID b128d21cbe8bfebac651404404b5936e8f5ab492
# Parent  47b3fca301f83b4c82ea99a696e283fd5baef460

relnotes: add note about changed labels texts

Differential Revision: https://phab.mercurial-scm.org/D12085

diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -24,6 +24,11 @@ labels passed to them if you include `$l
 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: