Mercurial > public > mercurial-scm > hg-stable

diff tests/test-up-local-change.t @ 15619:6c8573dd1b6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 07 Dec 2011 11:23:01 -0600
parents ffb5c09ba822
children efdcce3fd2d5
line wrap: on
line diff
--- a/tests/test-up-local-change.t	Wed Dec 07 11:22:57 2011 -0600
+++ b/tests/test-up-local-change.t	Wed Dec 07 11:23:01 2011 -0600
@@ -84,7 +84,8 @@
   summary:     1
   
   $ hg --debug merge
-  abort: there is nothing to merge - use "hg update" instead
+  abort: nothing to merge
+  (use 'hg update' instead)
   [255]
   $ hg parents
   changeset:   0:c19d34741b0a
@@ -169,7 +170,8 @@
   abort: crosses branches (merge branches or use --clean to discard changes)
   [255]
   $ hg --debug merge
-  abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  abort: outstanding uncommitted changes
+  (use 'hg status' to list changes)
   [255]
   $ hg --debug merge -f
     searching for copies back to rev 1