diff -r 31e9f66863f3 -r 093e8a5e995f tests/test-import-bypass.t --- a/tests/test-import-bypass.t Tue Mar 10 11:01:10 2015 -0700 +++ b/tests/test-import-bypass.t Fri Mar 06 22:56:19 2015 -0800 @@ -112,6 +112,9 @@ $ 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 + [255] Test commit editor (this also tests that editor is invoked, if the patch doesn't contain