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-fileset.t
changeset 35704 41ef02ba329b
parent 35692 a62b08f6626b
child 35741 73432eee0ac4 
--- a/tests/test-fileset.t	Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-fileset.t	Mon Jan 08 19:41:47 2018 +0530
@@ -226,7 +226,7 @@
   merging b2
   warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
   * files updated, 0 files merged, 1 files removed, 1 files unresolved (glob)
-  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]
   $ fileset 'resolved()'
   $ fileset 'unresolved()'
mercurial