diff -r d5ccc059fbcd -r a253ded5b03d tests/test-rebase-inmemory.t --- a/tests/test-rebase-inmemory.t Fri Jul 24 11:24:59 2020 -0700 +++ b/tests/test-rebase-inmemory.t Thu Jul 23 13:31:45 2020 -0700 @@ -901,7 +901,7 @@ [1] $ hg rebase -r 3 -d 1 -t:merge3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg resolve --list U foo