--- a/tests/test-rebase-scenario-global.t	Mon Aug 14 07:02:38 2017 -0700
+++ b/tests/test-rebase-scenario-global.t	Sat Aug 12 21:01:06 2017 -0700
@@ -271,7 +271,7 @@
 
   $ hg rebase -s 6 -d 1
   rebasing 6:eea13746799a "G"
-  abort: cannot use revision 6 as base, result would have 3 parents
+  abort: cannot rebase 6:eea13746799a without moving at least one of its parents
   [255]
   $ hg rebase --abort
   rebase aborted