diff tests/test-pick.t @ 4863:5cd7d16b8733 mercurial-5.0

test-compat: merge stable into mercurial-5.0

--- a/tests/test-pick.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-pick.t	Fri Sep 27 13:03:12 2019 +0200
@@ -1,4 +1,4 @@
-#testcases abortcommand abortflag
+#testcases abortflag
 Test for the pick command
 
   $ cat >> $HGRCPATH <<EOF
@@ -87,11 +87,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
 
@@ -248,10 +243,6 @@
   unresolved merge conflicts (see hg help resolve)
   [1]
 
-#if abortcommand
-  $ hg abort --dry-run
-  pick in progress, will be aborted
-#endif
   $ hg abort
   aborting pick, updating to c437988de89f