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-up-local-change.t
changeset 19800 4894e0d9462d
parent 18631 e2dc5397bc82
child 19802 94c394653b2a 
--- a/tests/test-up-local-change.t	Mon Sep 23 20:07:30 2013 -0700
+++ b/tests/test-up-local-change.t	Mon Sep 23 20:08:52 2013 -0700
@@ -167,7 +167,8 @@
   summary:     2
   
   $ hg --debug up
-  abort: crosses branches (merge branches or use --clean to discard changes)
+  abort: uncommitted changes
+  (commit and merge, or update --clean to discard changes)
   [255]
   $ hg --debug merge
   abort: outstanding uncommitted changes
mercurial