diff tests/test-topic-stack-complex.t @ 4360:522abf1d70b7 mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:54:44 -0500
parents 18d5a7525c2c 8974a05a49fa
children a2fdbece7ce1 d70db7e455dc
line wrap: on
line diff
--- a/tests/test-topic-stack-complex.t	Mon Dec 24 17:47:28 2018 +0100
+++ b/tests/test-topic-stack-complex.t	Tue Jan 22 12:54:44 2019 -0500
@@ -63,7 +63,7 @@
   > y
   > y
   > n
-  > y
+  > c
   > EOF
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   adding c
@@ -80,7 +80,7 @@
   new file mode 100644
   examine changes to 'd'? [Ynesfdaq?] n
   
-  Done splitting? [yN] y
+  continue splitting? [Ycdq?] c
   1 new orphan changesets
 
   $ hg stack