diff tests/test-topic-tutorial.t @ 4362:8bd60e09dfb4 mercurial-4.5

test-compat: merge mercurial-4.6 into mercurial-4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:55:09 -0500
parents 6be09fb2c08c 2cbb9914d227
children a2fdbece7ce1 ef1c322c389d
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t	Mon Dec 24 17:47:29 2018 +0100
+++ b/tests/test-topic-tutorial.t	Tue Jan 22 12:55:09 2019 -0500
@@ -1367,8 +1367,8 @@
 to do that rebase by hand.:
 
   $ hg next --evolve
-  move:[14] Adding saw
-  atop:[18] Adding hammer to the shopping list
+  move:[s2] Adding saw
+  atop:[s1] Adding hammer to the shopping list
   working directory now at d5c51ee5762a
 
   $ hg stack
@@ -1382,8 +1382,8 @@
 One more to go:
 
   $ hg next --evolve
-  move:[15] Adding drill
-  atop:[19] Adding saw
+  move:[s3] Adding drill
+  atop:[s2] Adding saw
   working directory now at bae3758e46bf
 
   $ hg stack