--- a/tests/test-bookmarks-rebase.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-bookmarks-rebase.t Mon Jul 13 16:42:44 2020 -0700
@@ -80,7 +80,7 @@
rebasing 4:dd7c838e8362 "4" (three tip)
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --abort
rebase aborted
@@ -95,7 +95,7 @@
rebasing 4:dd7c838e8362 "4" (three tip)
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg bookmark -d three
$ hg rebase --abort