tests/test-imerge.out

--- a/tests/test-imerge.out	Fri Aug 24 00:56:56 2007 +0200
+++ b/tests/test-imerge.out	Sat Aug 25 11:30:11 2007 +0200
@@ -41,5 +41,8 @@
 merged
 
 
+% nothing to merge -- tip
+abort: there is nothing to merge
+2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % nothing to merge
 abort: there is nothing to merge - use "hg update" instead