diff tests/test-pick.t @ 6693:49c2890007d2 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 05 Feb 2024 15:39:34 -0300
parents 873612cbecf6 e2fbec28654c
children
line wrap: on
line diff
--- a/tests/test-pick.t	Sun Oct 15 16:33:32 2023 -0300
+++ b/tests/test-pick.t	Mon Feb 05 15:39:34 2024 -0300
@@ -32,7 +32,8 @@
   
   move a commit onto the working directory parent and update to it.
   
-      If there is an active topic, it will be used for the resulting changeset.
+      The resulting changeset will have the current active topic. If there's no
+      active topic set, the resulting changeset will also not have any topic.
   
   options: