diff -r ca58f6475f1d -r 4134686b83e1 tests/test-merge-force.t
--- a/tests/test-merge-force.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge-force.t	Thu Sep 16 17:51:32 2010 -0500
@@ -20,6 +20,7 @@
 
   $ hg merge
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  [255]
 
 Should succeed with --force: