--- a/tests/test-backout.t	Mon Oct 12 12:52:45 2020 -0700
+++ b/tests/test-backout.t	Thu Oct 15 21:44:03 2020 -0700
@@ -804,5 +804,5 @@
 --no-commit can't be used with --merge
 
   $ hg backout --merge --no-commit 2
-  abort: cannot use --merge with --no-commit
+  abort: cannot specify both --no-commit and --merge
   [255]