--- a/tests/test-update-branches.t	Mon Sep 23 19:02:32 2013 -0700
+++ b/tests/test-update-branches.t	Mon Sep 23 17:43:33 2013 -0700
@@ -94,7 +94,8 @@
   parent=5
 
   $ norevtest 'none clean same'   clean 2
-  abort: crosses branches (merge branches or update --check to force update)
+  abort: not a linear update
+  (merge or update --check to force update)
   parent=2