diff -r 41abe2e3e3b7 -r 94c394653b2a tests/test-merge-force.t
--- a/tests/test-merge-force.t	Mon Sep 23 20:33:02 2013 -0700
+++ b/tests/test-merge-force.t	Mon Sep 23 20:50:51 2013 -0700
@@ -19,7 +19,7 @@
 Should fail, since there are deleted files:
 
   $ hg merge
-  abort: outstanding uncommitted changes
+  abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]