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-confused-revert.t
branchstable
changeset 14721 4fcde634f5e0
parent 14713 88a53081fb21
child 14903 a934b9249574 
--- a/tests/test-confused-revert.t	Wed Jun 22 10:13:44 2011 +0200
+++ b/tests/test-confused-revert.t	Wed Jun 22 15:34:33 2011 +0200
@@ -60,7 +60,7 @@
 
   $ hg revert
   abort: no files or directories specified
-  (use --all to discard all changes)
+  (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
   [255]
 
 Revert should be ok now:
mercurial