--- a/tests/test-evolve.t	Fri Aug 31 09:20:21 2018 +0200
+++ b/tests/test-evolve.t	Fri Aug 31 09:21:19 2018 +0200
@@ -596,7 +596,7 @@
   |/
   o  0:8685c6d34325@default(draft) add 0
   
-  $ hg grab -r3
+  $ hg pick -r3
   picking 3:0e84df4912da "add 3"
   $ hg graft -r1
   grafting 1:73d38bb17fd7 "add 1"
@@ -628,7 +628,7 @@
   $ hg ci -Am conflict 1
   created new head
   $ hg up -qC 6
-  $ hg grab -r 7
+  $ hg pick -r 7
   picking 7:a5bfd90a2f29 "conflict"
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
@@ -640,7 +640,7 @@
   $ hg resolve -m 1
   (no more unresolved files)
   continue: hg pick --continue
-  $ hg grab --continue
+  $ hg pick --continue
   $ glog --hidden
   @  8:fb2c0f0a0c54@default(draft) conflict
   |