Mercurial > hg-stable
changeset 48616:b128d21cbe8b
relnotes: add note about changed labels texts
Differential Revision: https://phab.mercurial-scm.org/D12085
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 24 Jan 2022 08:35:14 -0800 |
| parents | 47b3fca301f8 |
| children | 6a68350ec2ef |
| files | relnotes/next |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/relnotes/next Fri Jan 21 13:48:48 2022 -0800 +++ b/relnotes/next Mon Jan 24 08:35:14 2022 -0800 @@ -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: