Patchwork D12085: relnotes: add note about changed labels texts

login
register
mail settings
Submitter phabricator
Date Jan. 24, 2022, 4:41 p.m.
Message ID <differential-rev-PHID-DREV-lfxgatwyfqfjoia7kkxt-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50411/
State New
Headers show

Comments

phabricator - Jan. 24, 2022, 4:41 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  relnotes/next

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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: