diff mercurial/commands.py @ 50429:771294224bf6

branching: merge stable into default

--- a/mercurial/commands.py	Wed Apr 12 00:57:01 2023 +0200
+++ b/mercurial/commands.py	Fri Apr 14 10:41:40 2023 +0200
@@ -6609,7 +6609,7 @@
         ),
         (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
         (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
-        (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
+        (b'6', b'ipv6', None, _(b'use IPv6 instead of IPv4')),
         (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
         (b'', b'print-url', None, _(b'start and print only the URL')),
     ]