--- a/tests/test-merge-default.out
+++ b/tests/test-merge-default.out
@@ -13,5 +13,8 @@ 0 files updated, 0 files merged, 0 files
 % 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