diff -r 8f07f5a9c3de -r 21733e8c924f tests/test-bookmarks-rebase.t --- a/tests/test-bookmarks-rebase.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-bookmarks-rebase.t Wed Oct 21 19:00:16 2020 -0700 @@ -81,7 +81,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ hg rebase --abort rebase aborted $ hg bookmark @@ -96,7 +96,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ hg bookmark -d three $ hg rebase --abort rebase aborted