tests/test-evolve.t
changeset 4049 25981fae92f9
parent 3983 a689f07d5663
child 4051 ddae36b4031e
--- a/tests/test-evolve.t	Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-evolve.t	Fri Aug 31 09:13:11 2018 +0200
@@ -597,7 +597,7 @@
   o  0:8685c6d34325@default(draft) add 0
   
   $ hg grab -r3
-  grabbing 3:0e84df4912da "add 3"
+  picking 3:0e84df4912da "add 3"
   $ hg graft -r1
   grafting 1:73d38bb17fd7 "add 1"
   $ hg prune -r2 --succ .
@@ -629,7 +629,7 @@
   created new head
   $ hg up -qC 6
   $ hg grab -r 7
-  grabbing 7:a5bfd90a2f29 "conflict"
+  picking 7:a5bfd90a2f29 "conflict"
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)