diff -r ca58f6475f1d -r 4134686b83e1 tests/test-merge9.t
--- a/tests/test-merge9.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge9.t	Thu Sep 16 17:51:32 2010 -0500
@@ -31,6 +31,7 @@
   merging foo and baz to baz
   1 files updated, 1 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
   $ hg resolve -l
   U bar
   R baz
@@ -44,6 +45,7 @@
   merging baz and foo to baz
   1 files updated, 1 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
 
 show unresolved
   $ hg resolve -l
@@ -75,12 +77,14 @@
 resolve all warning
   $ hg resolve
   abort: no files or directories specified; use --all to remerge all files
+  [255]
 
 resolve all
   $ hg resolve -a
   merging bar
   warning: conflicts during merge.
   merging bar failed!
+  [1]
 
 after
   $ hg resolve -l