Mercurial Mercurial > mercurial / 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-convert-svn-sink.t
changeset 35704 41ef02ba329b
parent 35393 4441705b7111
child 39707 5abc47d4ca6b 
--- a/tests/test-convert-svn-sink.t	Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-convert-svn-sink.t	Mon Jan 08 19:41:47 2018 +0530
@@ -384,7 +384,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   2 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ hg --cwd b revert -r 2 b
   $ hg --cwd b resolve -m b
mercurial