--- 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