Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-topic.t
branchmercurial-4.4
changeset 4552 0eb80259f9cb
parent 4363 a2fdbece7ce1
parent 4551 7de160f6c7a9
child 4675 79bc0f1a832e 
--- 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
evolve