--- a/tests/test-subrepo-svn.t	Mon Sep 23 17:43:33 2013 -0700
+++ b/tests/test-subrepo-svn.t	Mon Sep 23 20:07:30 2013 -0700
@@ -477,7 +477,8 @@
 This is surprising, but is also correct based on the current code:
   $ echo "updating should (maybe) fail" > obstruct/other
   $ hg co tip
-  abort: crosses branches (merge branches or use --clean to discard changes)
+  abort: uncommitted changes
+  (commit or update --clean to discard changes)
   [255]
 
 Point to a Subversion branch which has since been deleted and recreated