--- a/tests/test-rebase-check-restore.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-check-restore.t Mon Jul 13 16:42:44 2020 -0700
@@ -69,7 +69,7 @@
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (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]
Solve the conflict and go on:
@@ -126,7 +126,7 @@
rebasing 5:01e6ebbd8272 "F" (tip)
merging A
warning: conflicts while merging A! (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]
Solve the conflict and go on: