diff -r d7034826c0a2 -r 25981fae92f9 tests/test-grab.t
--- a/tests/test-grab.t	Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-grab.t	Fri Aug 31 09:13:11 2018 +0200
@@ -46,13 +46,13 @@
 Grabbing an ancestor
 
   $ hg grab -r 7c3bad9141dc
-  abort: cannot grab an ancestor revision
+  abort: cannot pick an ancestor revision
   [255]
 
 Grabbing the working directory parent
 
   $ hg grab -r .
-  abort: cannot grab an ancestor revision
+  abort: cannot pick an ancestor revision
   [255]
 
 Specifying multiple revisions to grab
@@ -70,13 +70,13 @@
 Continuing without interrupted grab
 
   $ hg grab --continue
-  abort: no interrupted grab state exists
+  abort: no interrupted pick state exists
   [255]
 
 Aborting without interrupted grab
 
   $ hg grab --abort
-  abort: no interrupted grab state exists
+  abort: no interrupted pick state exists
   [255]
 
 Specifying both continue and revs
@@ -107,7 +107,7 @@
 Grabbing a revision
 
   $ hg grab 7c3bad9141dc
-  grabbing 1:7c3bad9141dc "add b"
+  picking 1:7c3bad9141dc "add b"
   1 new orphan changesets
   $ hg glog
   @  5:7c15c05db6fa add b
@@ -144,8 +144,8 @@
   o  0:1f0dee641bb7 add a
   
   $ hg grab -r 4538525df7e2
-  grabbing 2:4538525df7e2 "add c"
-  note: grab of 2:4538525df7e2 created no changes to commit
+  picking 2:4538525df7e2 "add c"
+  note: picking 2:4538525df7e2 created no changes to commit
 
   $ hg glog
   @  6:c4636a81ebeb add c
@@ -165,7 +165,7 @@
   $ echo foo > c
   $ hg ci -Aqm "foo to c"
   $ hg grab -r c4636a81ebeb
-  grabbing 6:c4636a81ebeb "add c"
+  picking 6:c4636a81ebeb "add c"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
@@ -203,7 +203,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg grab 4e04628911f6
-  grabbing 9:4e04628911f6 "foo to c"
+  picking 9:4e04628911f6 "foo to c"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
@@ -214,7 +214,7 @@
   continue: hg grab --continue
 
   $ hg grab --continue
-  note: grab of 9:4e04628911f6 created no changes to commit
+  note: picking 9:4e04628911f6 created no changes to commit
 
 Testing the abort functionality of hg grab
 
@@ -228,14 +228,14 @@
   ~
 
   $ hg grab -r 7c15c05db6fa
-  grabbing 5:7c15c05db6fa "add b"
+  picking 5:7c15c05db6fa "add b"
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
   [1]
 
   $ hg grab --abort
-  aborting grab, updating to c437988de89f
+  aborting pick, updating to c437988de89f
 
   $ hg glog
   @  10:c437988de89f foo to b
@@ -258,7 +258,7 @@
   $ hg phase -r 7c15c05db6fa -p
 
   $ hg grab -r 7c15c05db6fa
-  abort: cannot grab public changesets: 7c15c05db6fa
+  abort: cannot pick public changesets: 7c15c05db6fa
   (see 'hg help phases' for details)
   [255]
 
@@ -284,7 +284,7 @@
   $ hg phase -r 7c15c05db6fa -s -f
 
   $ hg grab -r 7c15c05db6fa
-  grabbing 5:7c15c05db6fa "add b"
+  picking 5:7c15c05db6fa "add b"
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
@@ -331,7 +331,7 @@
   3 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg grab -r 508d572e7053
-  grabbing 12:508d572e7053 "added l"
+  picking 12:508d572e7053 "added l"
 
   $ hg phase -r .
   13: secret