Mercurial > hg

diff tests/test-rebase-partial.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 5abc47d4ca6b
children f90a5c211251
line wrap: on
line diff
--- a/tests/test-rebase-partial.t	Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-partial.t	Mon Jul 13 16:42:44 2020 -0700
@@ -84,7 +84,7 @@
   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