relnotes/next
changeset 48587 3c8cc987672e
parent 48549 28f0092ec89f
child 48594 b128d21cbe8b
--- a/relnotes/next	Thu Jan 20 16:16:05 2022 -0800
+++ b/relnotes/next	Thu Jan 20 11:06:52 2022 -0800
@@ -18,6 +18,12 @@
 The remotefilelog extension now requires an appropiate excludepattern
 for subrepositories.
 
+The labels passed to merge tools have changed slightly. Merge tools can get
+labels passed to them if you include `$labellocal`, `$labelbase`, and/or
+`$labelother` in the `merge-tool.<tool name>.args` configuration. These labels
+used to have some space-padding, and truncation to fit within 72 columns. Both
+the padding and the truncation has been removed.
+
 == Internal API Changes ==
 
 The following functions have been removed: