--- a/tests/test-newbranch.t Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-newbranch.t Thu Sep 16 17:51:32 2010 -0500
@@ -20,6 +20,7 @@
$ hg branch default
abort: a branch of the same name already exists (use 'hg update' to switch to it)
+ [255]
$ hg branch -f default
marked working directory as branch default
@@ -186,6 +187,7 @@
$ hg up
abort: branch foobar not found
+ [255]
Fastforward merge:
@@ -292,6 +294,7 @@
$ hg merge
abort: branch 'test' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
+ [255]
$ hg up -C default
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -300,6 +303,7 @@
$ hg merge
abort: branch 'default' has 3 heads - please merge with an explicit rev
(run 'hg heads .' to see heads)
+ [255]
3 branch heads, explicit merge required: