--- a/tests/test-rebase-abort.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-abort.t Mon Jul 13 16:42:44 2020 -0700
@@ -81,7 +81,7 @@
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
warning: conflicts while merging common! (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]
Insert unsupported advisory merge record:
@@ -148,7 +148,7 @@
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
warning: conflicts while merging common! (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]
$ mv .hg/rebasestate .hg/rebasestate.back
@@ -218,7 +218,7 @@
rebasing 4:145842775fec "C1" (tip)
merging c
warning: conflicts while merging c! (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
@@ -277,7 +277,7 @@
rebasing 3:6c0f977a22d8 "C" (foo tip)
merging c
warning: conflicts while merging c! (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 abort
rebase aborted
@@ -315,7 +315,7 @@
$ hg rebase -d @ -b foo --tool=internal:fail
rebasing 2:070cf4580bb5 "b2" (foo tip)
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3
@@ -462,7 +462,7 @@
$ hg rebase -d 1 --tool 'internal:fail'
rebasing 2:e4ea5cdc9789 "conflicting 1"
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg abort
rebase aborted
@@ -503,7 +503,7 @@
$ hg rebase -d 'public()' --tool :merge -q
note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes
warning: conflicts while merging root! (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 abort
rebase aborted