--- a/tests/test-import-bypass.t Thu Oct 15 21:44:03 2020 -0700
+++ b/tests/test-import-bypass.t Thu Oct 15 21:48:43 2020 -0700
@@ -26,7 +26,7 @@
and '--edit')
$ hg import --bypass --exact --edit ../test.diff
- abort: cannot use --exact with --edit
+ abort: cannot specify both --exact and --edit
[255]
$ hg import --bypass --exact ../test.diff
applying ../test.diff
@@ -188,13 +188,13 @@
Test unsupported combinations
$ hg import --bypass --no-commit ../test.diff
- abort: cannot use --no-commit with --bypass
+ abort: cannot specify both --no-commit and --bypass
[255]
$ hg import --bypass --similarity 50 ../test.diff
abort: cannot use --similarity with --bypass
[255]
$ hg import --exact --prefix dir/ ../test.diff
- abort: cannot use --exact with --prefix
+ abort: cannot specify both --exact and --prefix
[255]
Test commit editor