Mercurial > hg

diff tests/test-resolve.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 b7808443ed6a
children 766797f23f77
line wrap: on
line diff
--- a/tests/test-resolve.t	Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-resolve.t	Mon Jul 13 16:42:44 2020 -0700
@@ -520,7 +520,7 @@
   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: