Mercurial > hg

diff tests/test-imerge @ 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 12930b97a729
children 5c5e45766224
line wrap: on
line diff
--- a/tests/test-imerge	Fri Aug 24 00:56:56 2007 +0200
+++ b/tests/test-imerge	Sat Aug 25 11:30:11 2007 +0200
@@ -54,6 +54,10 @@
 hg ci -m'merged' -d '3 0'
 hg tip -v
 
+echo % nothing to merge -- tip
+hg imerge
+
+hg up 0
 echo % nothing to merge
 hg imerge