Mercurial > hg

diff tests/test-merge-default.out @ 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 4b0c9c674707
line wrap: on
line diff
--- a/tests/test-merge-default.out	Fri Aug 24 00:56:56 2007 +0200
+++ b/tests/test-merge-default.out	Sat Aug 25 11:30:11 2007 +0200
@@ -13,5 +13,8 @@
 % should succeed - 2 heads
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+% should fail because at tip
+abort: there is nothing to merge
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail because 1 head
 abort: there is nothing to merge - use "hg update" instead