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 19802 94c394653b2a
parent 19800 4894e0d9462d
child 20641 3db9e798e004 
--- a/tests/test-up-local-change.t	Mon Sep 23 20:33:02 2013 -0700
+++ b/tests/test-up-local-change.t	Mon Sep 23 20:50:51 2013 -0700
@@ -171,7 +171,7 @@
   (commit and merge, or update --clean to discard changes)
   [255]
   $ hg --debug merge
-  abort: outstanding uncommitted changes
+  abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]
   $ hg --debug merge -f
mercurial