diff -r 76df01e56e7f -r ab3e42225dbc tests/test-merge5.t
--- a/tests/test-merge5.t	Mon Sep 23 17:43:33 2013 -0700
+++ b/tests/test-merge5.t	Mon Sep 23 20:07:30 2013 -0700
@@ -33,7 +33,8 @@
 Should abort:
 
   $ hg update -y 1
-  abort: crosses branches (merge branches or use --clean to discard changes)
+  abort: uncommitted changes
+  (commit or update --clean to discard changes)
   [255]
   $ mv c a