Mercurial > evolve

diff tests/test-topic.t @ 4552:0eb80259f9cb mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 20 Apr 2019 03:55:11 +0200
parents a2fdbece7ce1 7de160f6c7a9
children 79bc0f1a832e
line wrap: on
line diff
--- a/tests/test-topic.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-topic.t	Sat Apr 20 03:55:11 2019 +0200
@@ -515,7 +515,7 @@
   merging alpha
   warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg revert -r narf alpha
   $ hg resolve -m alpha