tests/test-stabilize-conflict.t
changeset 4576 96ce1030d2fb
parent 3978 fb8e44c70798
child 4675 79bc0f1a832e
child 4676 b6c819facbe8
--- a/tests/test-stabilize-conflict.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-stabilize-conflict.t	Sun Apr 14 02:18:19 2019 +0800
@@ -77,7 +77,7 @@
    dix
   $ hg amend
   1 new orphan changesets
-  $ hg evolve
+  $ hg evolve --update
   move:[2] babar count up to fifteen
   atop:[3] babar count up to ten
   merging babar
@@ -123,7 +123,7 @@
   +ten
   $ hg amend
   1 new orphan changesets
-  $ hg evolve
+  $ hg evolve --update
   move:[4] babar count up to fifteen
   atop:[5] babar count up to ten
   merging babar