diff -r 183eb1d7f87d -r 749b057b01f3 tests/test-rebase-scenario-global.t --- a/tests/test-rebase-scenario-global.t Tue Mar 07 14:04:29 2017 -0800 +++ b/tests/test-rebase-scenario-global.t Tue Mar 07 16:30:31 2017 -0800 @@ -272,7 +272,8 @@ rebasing 6:eea13746799a "G" abort: cannot use revision 6 as base, result would have 3 parents [255] - + $ hg rebase --abort + rebase aborted These will abort gracefully (using --base):