--- a/tests/test-rebase-collapse.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-collapse.t Mon Jul 13 16:42:44 2020 -0700
@@ -291,7 +291,7 @@
file 'E' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ echo F > E
@@ -658,7 +658,7 @@
rebasing 1:81e5401e4d37 "B" (B)
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]
$ rm A.orig
$ hg resolve --mark A
@@ -705,7 +705,7 @@
rebasing 1:f899f3910ce7 "B" (B)
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]
$ hg tglog
o 3: 63668d570d21 'C'
@@ -733,7 +733,7 @@
rebasing 3:63668d570d21 "C" (C 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]
$ hg tglog
% 3: 63668d570d21 'C'