diff tests/test-pick.t @ 6187:df8df57a3ce3 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0

--- a/tests/test-pick.t	Tue Feb 22 18:14:26 2022 +0300
+++ b/tests/test-pick.t	Tue Feb 22 18:21:24 2022 +0300
@@ -1,4 +1,4 @@
-#testcases abortcommand abortflag
+#testcases abortflag
 Test for the pick command
 
   $ cat >> $HGRCPATH <<EOF
@@ -89,11 +89,6 @@
   $ hg pick --abort
   abort: no interrupted pick state exists
   [255]
-#if abortcommand
-  $ hg abort
-  abort: no operation in progress
-  [255]
-#endif
 
 Specifying both continue and revs
 
@@ -264,10 +259,6 @@
   unresolved merge conflicts (see hg help resolve)
   [1]
 
-#if abortcommand
-  $ hg abort --dry-run
-  pick in progress, will be aborted
-#endif
   $ hg abort
   pick aborted
   working directory is now at c437988de89f