tests/test-stabilize-conflict.t
changeset 2854 66796d7b5415
parent 2834 38db1466c6fb
child 2896 462adae9fea7
--- a/tests/test-stabilize-conflict.t	Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Thu Aug 24 09:11:06 2017 +0200
@@ -76,7 +76,7 @@
    neuf
    dix
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg evolve
   move:[2] babar count up to fifteen
   atop:[4] babar count up to ten
@@ -122,7 +122,7 @@
   -dix
   +ten
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ hg evolve
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
@@ -209,7 +209,7 @@
   -ten
   +zehn
   $ hg amend
-  1 new unstable changesets
+  1 new orphan changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
   $ hg evolve --tool touch <<EOF
   > n