tests/test-stabilize-conflict.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4363 a2fdbece7ce1
parent 4576 96ce1030d2fb
--- a/tests/test-stabilize-conflict.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-stabilize-conflict.t	Wed Jun 05 17:56:44 2019 +0200
@@ -76,7 +76,6 @@
    neuf
    dix
   $ hg amend
-  1 new orphan changesets
   $ hg evolve --update
   move:[2] babar count up to fifteen
   atop:[3] babar count up to ten
@@ -122,7 +121,6 @@
   -dix
   +ten
   $ hg amend
-  1 new orphan changesets
   $ hg evolve --update
   move:[4] babar count up to fifteen
   atop:[5] babar count up to ten
@@ -209,7 +207,6 @@
   -ten
   +zehn
   $ hg amend
-  1 new orphan changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
   $ hg evolve --tool touch <<EOF
   > n