diff -r 8f07f5a9c3de -r 21733e8c924f tests/test-rebase-backup.t --- a/tests/test-rebase-backup.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-rebase-backup.t Wed Oct 21 19:00:16 2020 -0700 @@ -127,7 +127,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ hg rebase --abort saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg rebase aborted @@ -143,7 +143,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ hg rebase --abort rebase aborted $ cd ..