tests/test-pick.t
branchmercurial-5.0
changeset 5280 90fbbc29b93a
parent 4968 d299af4da8d8
child 4971 9f69164cdc16
child 5364 be5aa681c122
--- a/tests/test-pick.t	Wed Apr 08 01:16:53 2020 +0800
+++ b/tests/test-pick.t	Wed Apr 08 01:16:54 2020 +0800
@@ -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
 
@@ -259,10 +254,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