Mercurial > hg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: unify the error message formats for 'rebase' and 'unshelve' Differential Revision: https://phab.mercurial-scm.org/D8730
author Daniel Ploch <dploch@google.com>
date Mon, 13 Jul 2020 16:42:44 -0700
parents 4edd427f34c1
children f90a5c211251
line wrap: on
line diff
--- a/tests/test-rebase-detach.t	Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-detach.t	Mon Jul 13 16:42:44 2020 -0700
@@ -297,7 +297,7 @@
   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)