error: unify the error message formats for 'rebase' and 'unshelve'

Differential Revision: https://phab.mercurial-scm.org/D8730

hgext/rebase.py

@@ -632,8 +632,8 b' class rebaseruntime(object):'
                         else:
                             raise error.InterventionRequired(
                                 _(
-                                    b'unresolved conflicts (see hg '
-                                    b'resolve, then hg rebase --continue)'
+                                    b"unresolved conflicts (see 'hg "
+                                    b"resolve', then 'hg rebase --continue')"
                                 )
                             )
             if not self.collapsef:

tests/test-absorb-unfinished.t

@@ -20,7 +20,7 b' Abort absorb if there is an unfinished o'
   rebasing 1:c3b6dc0e177a "foo 2" (tip)
   merging foo.whole
   warning: conflicts while merging foo.whole! (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 --config extensions.rebase= absorb

tests/test-bookmarks-rebase.t

@@ -80,7 +80,7 b' aborted rebase should restore active boo'
   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 b' after aborted rebase, restoring a bookma'
   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

tests/test-copytrace-heuristics.t

@@ -91,7 +91,7 b' Make sure filename heuristics do not whe'
   file 'a' 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]
 
   $ cd ..
@@ -248,7 +248,7 b' With small limit'
   file 'a' 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]
 
   $ hg rebase --abort
@@ -710,7 +710,7 b' When the sourcecommitlimit is small and '
   file 'a' 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]
 
 But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do

tests/test-fix.t

@@ -868,7 +868,7 b' fixing the working directory if there ar'
   rebasing 1:c3b6dc0e177a "foo 2" (tip)
   merging foo.whole
   warning: conflicts while merging foo.whole! (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 --config extensions.rebase= fix --working-dir

tests/test-largefiles-update.t

@@ -593,7 +593,7 b' it is aborted by conflict.'
   what do you want to do? o
   merging normal1
   warning: conflicts while merging normal1! (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]
   $ cat .hglf/large1
   58e24f733a964da346e2407a2bee99d9001184f5

tests/test-merge-halt.t

@@ -27,7 +27,7 b' Testing on-failure=continue'
   merging b
   merging a failed!
   merging b failed!
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
   $ hg resolve --list

tests/test-narrow-rebase.t

@@ -72,7 +72,7 b' Can rebase onto conflicting changes insi'
   $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'
   rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)
   merging inside/f1
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   $ echo modified3 > inside/f1
   $ hg resolve -m 2>&1 | grep -v continue:
   (no more unresolved files)

tests/test-rebase-abort.t

@@ -81,7 +81,7 b' Conflicting rebase:'
   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 b' earlier than 2.7 by renaming ".hg/rebase'
   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 b' Rebase and abort without generating new '
   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 b' rebase abort should not leave working co'
   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 b' user has somehow managed to update to a '
 
   $ 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 b' during a rebase (issue4661)'
 
   $ 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 b' commit will cause merge conflict on reba'
   $ 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

tests/test-rebase-backup.t

@@ -126,7 +126,7 b' When backup-bundle = True:'
   rebasing 6:f8bc7d28e573 "c"
   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 rebase --abort
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg
@@ -142,7 +142,7 b' When backup-bundle = False:'
   rebasing 6:f8bc7d28e573 "c"
   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 rebase --abort
   rebase aborted

tests/test-rebase-bookmarks.t

@@ -172,7 +172,7 b' rebase --continue with bookmarks present'
   rebasing 3:3d5fa227f4b5 "C" (Y Z)
   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]
   $ echo 'c' > c
   $ hg resolve --mark c

tests/test-rebase-check-restore.t

@@ -69,7 +69,7 b' Rebasing B onto E - check keep: and phas'
   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 b' Rebase F onto E - check keepbranches:'
   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:

tests/test-rebase-collapse.t

@@ -291,7 +291,7 b' Preserves external parent'
   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 b' running into merge conflict and invoking'
   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 b' Test aborted editor on final message'
   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 b' Test aborted editor on final message'
   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'

tests/test-rebase-conflicts.t

@@ -66,7 +66,7 b' Conflicting rebase:'
   rebasing 4:46f0b057b5c0 "L2"
   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]
 
   $ hg status --config commands.status.verbose=1
@@ -344,7 +344,7 b' Test minimization of merge conflicts'
   rebasing 13:7bc217434fc1 "abc" (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 diff
   diff -r 328e4ab1f7cc a
@@ -364,7 +364,7 b' Test minimization of merge conflicts'
   rebasing 13:7bc217434fc1 "abc" (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 diff
   diff -r 328e4ab1f7cc a
@@ -402,7 +402,7 b' Test rebase with obsstore turned on and '
   rebasing 1:112478962961 "B" (B)
   merging B
   warning: conflicts while merging B! (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]
 
   $ echo 4 > B
@@ -454,7 +454,7 b' Test where the conflict happens when reb'
   rebasing 5:9a6b91dc2044 "F" (F tip)
   merging conflict
   warning: conflicts while merging conflict! (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
   @  8:draft 'E'

tests/test-rebase-dest.t

@@ -48,7 +48,7 b' Requiring dest should not break continue'
   rebasing 3:0537f6b50def "dc" (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]
   $ echo d > c
   $ hg resolve --mark --all

tests/test-rebase-detach.t

@@ -297,7 +297,7 b' Ensure --continue restores a correct sta'
   rebasing 3:17b4880d2402 "B2" (tip)
   merging B
   warning: conflicts while merging B! (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 resolve --all -t internal:local
   (no more unresolved files)

tests/test-rebase-inmemory.t

@@ -471,7 +471,7 b' In-memory rebase that fails due to merge'
   rebasing 4:e860deea161a "e"
   merging e
   warning: conflicts while merging e! (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
   saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
@@ -863,7 +863,7 b' Test rebasing when the file we are mergi'
   rebasing 2:fb62b706688e "add b to foo" (tip)
   merging foo
   warning: conflicts while merging foo! (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]
 
   $ cd $TESTTMP
@@ -897,7 +897,7 b" Test rebasing when we're in the middle o"
   rebasing 2:b4d249fbf8dd "bye from foo"
   merging foo
   warning: conflicts while merging foo! (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 -r 3 -d 1 -t:merge3
   abort: rebase in progress

tests/test-rebase-interruptions.t

@@ -61,7 +61,7 b' Rebasing B onto E:'
   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]
 
 Force a commit on C during the interruption:
@@ -98,7 +98,7 b' Resume the rebasing:'
   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:
@@ -157,7 +157,7 b' Rebasing B onto E:'
   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]
 
 Force a commit on B' during the interruption:
@@ -229,7 +229,7 b' Rebasing B onto E:'
   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]
 
 Change phase on B and B'
@@ -302,7 +302,7 b' Continue rebase after upgrading from an '
   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]
   $ hg tglog
   @  5: 45396c49d53b 'B'
@@ -505,7 +505,7 b' Make sure merge state is cleaned up afte'
   rebasing 1:fdaca8533b86 "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]
   $ echo a > a
   $ echo c >> a
@@ -525,7 +525,7 b' Now try again with --collapse'
   rebasing 2:fdaca8533b86 "b" (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]
   $ echo a > a
   $ echo c >> a

tests/test-rebase-mq-skip.t

@@ -155,7 +155,7 b' already has one local mq patch'
   rebasing 3:6ff5b8feed8e "r3" (r3)
   note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes
   rebasing 4:094320fec554 "r4" (r4)
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
   $ HGMERGE=internal:local hg resolve --all

tests/test-rebase-mq.t

@@ -62,7 +62,7 b' Rebase - generate a conflict:'
   rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
   merging f
   warning: conflicts while merging f! (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]
 
 Fix the 1st conflict:
@@ -76,7 +76,7 b' Fix the 1st conflict:'
   rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
   merging f
   warning: conflicts while merging f! (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]
 
 Fix the 2nd conflict:

tests/test-rebase-obsolete.t

@@ -1032,7 +1032,7 b' Create the changes that we will rebase'
   rebasing 19:b82fb57ea638 "willconflict second version"
   merging willconflict
   warning: conflicts while merging willconflict! (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 resolve --mark willconflict
@@ -1787,7 +1787,7 b' rebasestate may contain hidden hashes. "'
   rebasing 1:2ec65233581b "B"
   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]
 
   $ cp -R . $TESTTMP/hidden-state2
@@ -1872,7 +1872,7 b' Test --stop option |'
   rebasing 3:055a42cdd887 "d"
   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 --stop
   1 new orphan changesets
@@ -1934,7 +1934,7 b' Test it aborts if unstable csets is not '
   rebasing 3:055a42cdd887 "d"
   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 --stop
   abort: cannot remove original changesets with unrebased descendants
@@ -1952,7 +1952,7 b' Test --stop when --keep is passed:'
   rebasing 3:055a42cdd887 "d"
   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 --stop
   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
@@ -2014,7 +2014,7 b' Test --stop aborts when --collapse was p'
   rebasing 3:055a42cdd887 "d"
   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 --stop
   abort: cannot stop in --collapse session
@@ -2047,7 +2047,7 b' Test --stop raise errors with conflictin'
   rebasing 3:055a42cdd887 "d"
   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 --stop --dry-run
   abort: cannot specify both --stop and --dry-run
@@ -2115,7 +2115,7 b' Test --stop moves bookmarks of original '
   rebasing 3:67a385d4e6f2 "D" (Z)
   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 --stop
   1 new orphan changesets

tests/test-rebase-parameters.t

@@ -479,7 +479,7 b' Test --tool parameter:'
 
   $ hg rebase -s 2 -d 1 --tool internal:fail
   rebasing 2:e4e3f3546619 "c2b" (tip)
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
   $ hg summary

tests/test-rebase-partial.t

@@ -84,7 +84,7 b" Abort doesn't lose the commits that were"
   rebasing 2:ef8c0fe0897b "D" (D)
   merging file
   warning: conflicts while merging file! (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

tests/test-rebase-transaction.t

@@ -107,7 +107,7 b' continued'
   rebasing 3:c26739dbe603 "C" (C)
   merging conflict
   warning: conflicts while merging conflict! (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  5: D

tests/test-resolve.t

@@ -520,7 +520,7 b" Test 'hg resolve' confirm config option "
   warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging emp3! (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]
 
 Test when commands.resolve.confirm config option is not set:

tests/test-sparse-profiles.t

@@ -200,7 +200,7 b' Verify rebase conflicts pulls in the con'
   merging data.py
   warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging data.py! (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 *.orig
   $ ls -A

tests/test-sparse.t

@@ -200,7 +200,7 b' Verify rebase temporarily includes exclu'
   temporarily included 2 file(s) in the sparse checkout for merging
   merging hide
   warning: conflicts while merging hide! (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 debugsparse