Mercurial > public > mercurial-scm > hg

diff tests/test-merge-default.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 4134686b83e1
children fc8c7a5ccc4a
line wrap: on
line diff
--- a/tests/test-merge-default.t	Wed Dec 07 11:22:57 2011 -0600
+++ b/tests/test-merge-default.t	Wed Dec 07 11:23:01 2011 -0600
@@ -66,7 +66,7 @@
 Should fail because at tip:
 
   $ hg merge
-  abort: there is nothing to merge
+  abort: nothing to merge
   [255]
 
   $ hg up 0
@@ -75,7 +75,8 @@
 Should fail because there is only one head:
 
   $ hg merge
-  abort: there is nothing to merge - use "hg update" instead
+  abort: nothing to merge
+  (use 'hg update' instead)
   [255]
 
   $ hg up 3