diff tests/test-rebase-conflicts.t @ 45150:dc5e5577af39

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

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

--- a/tests/test-rebase-conflicts.t	Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-conflicts.t	Mon Jul 13 16:42:44 2020 -0700
@@ -66,7 +66,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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'