Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-default @ 5242:9cd6578750b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve error message for 'hg merge' when repo already at branchtip
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 25 Aug 2007 11:30:11 +0200
parents 013921c753bd
children 50b6af595e0c
line wrap: on
line diff
--- a/tests/test-merge-default	Fri Aug 24 00:56:56 2007 +0200
+++ b/tests/test-merge-default	Sat Aug 25 11:30:11 2007 +0200
@@ -34,6 +34,10 @@
 hg merge
 hg commit -mm2
 
+echo % should fail because at tip
+hg merge
+
+hg up 0
 echo % should fail because 1 head
 hg merge