--- a/tests/test-merge5.t Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge5.t Thu Sep 16 17:51:32 2010 -0500
@@ -15,6 +15,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update
abort: crosses branches (use 'hg merge' or use 'hg update -c')
+ [255]
$ hg update -c
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv a c
@@ -27,6 +28,7 @@
$ hg update -y 1
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
+ [255]
$ mv c a
Should succeed: