--- a/tests/test-newbranch.out Sun Feb 07 00:43:24 2010 +0100
+++ b/tests/test-newbranch.out Sun Feb 07 00:51:59 2010 +0100
@@ -168,9 +168,11 @@
% implicit merge with test branch as parent
abort: branch 'test' has one head - please merge with an explicit rev
+(run 'hg heads' to see all heads)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
% implicit merge with default branch as parent
abort: branch 'default' has 3 heads - please merge with an explicit rev
+(run 'hg heads .' to see heads)
% 3 branch heads, explicit merge required
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)