diff tests/test-topic-stack.t @ 5823:fd039a7f0c3c mercurial-5.6

test-compat: merge stable into mercurial-5.6

# no-check-commit

--- a/tests/test-topic-stack.t	Fri Jan 29 17:23:31 2021 +0800
+++ b/tests/test-topic-stack.t	Thu Mar 11 12:29:50 2021 +0800
@@ -66,7 +66,7 @@
   active topic 'other' is now empty
   (use 'hg topic --clear' to clear it if needed)
 
-After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informating the user about it and displaying good data in this case.
+After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informing the user about it and displaying good data in this case.
 
   $ hg topic
      foo   (4 changesets)
@@ -469,10 +469,10 @@
   s1: c_c
   s0^ c_b (base)
 
-Case with multiple heads on the topic with unstability involved
+Case with multiple heads on the topic with instability involved
 ---------------------------------------------------------------
 
-We amend the message to make sure the display base pick the right changeset
+We amend the message to make sure the display base picks the right changeset
 
   $ hg up 'desc(c_d)'
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -759,7 +759,7 @@
 Even with some obsolete and orphan changesets
 
 (the ordering of each branch of "blue" change because their hash change. we
-should stabilize this eventuelly)
+should stabilize this eventually)
 
   $ hg up 'desc("c_B")'
   switching to topic red
@@ -1026,7 +1026,7 @@
   @@ -0,0 +1,1 @@
   +zzz
 
-Check that stack ouput still make sense
+Check that stack output still makes sense
 
   $ hg stack
   ### topic: blue