--- a/tests/test-evolve.t	Tue Aug 28 11:25:32 2018 +0200
+++ b/tests/test-evolve.t	Mon Sep 03 22:09:26 2018 +0200
@@ -600,8 +600,8 @@
   |/
   o  0:8685c6d34325@default(draft) add 0
   
-  $ hg grab -r3
-  grabbing 3:0e84df4912da "add 3"
+  $ hg pick -r3
+  picking 3:0e84df4912da "add 3"
   $ hg graft -r1
   grafting 1:73d38bb17fd7 "add 1"
   $ hg prune -r2 --succ .
@@ -632,8 +632,8 @@
   $ hg ci -Am conflict 1
   created new head
   $ hg up -qC 6
-  $ hg grab -r 7
-  grabbing 7:a5bfd90a2f29 "conflict"
+  $ hg pick -r 7
+  picking 7:a5bfd90a2f29 "conflict"
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
@@ -643,8 +643,8 @@
   $ echo 3 > 1
   $ hg resolve -m 1
   (no more unresolved files)
-  continue: hg grab --continue
-  $ hg grab --continue
+  continue: hg pick --continue
+  $ hg pick --continue
   $ glog --hidden
   @  8:fb2c0f0a0c54@default(draft) conflict
   |