Mercurial > public > mercurial-scm > hg

diff tests/test-up-local-change.t @ 19800:4894e0d9462d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: improve error message for dirty non-linear update with rev
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:08:52 -0700
parents e2dc5397bc82
children 94c394653b2a
line wrap: on
line diff
--- 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