--- a/tests/test-merge1.t	Thu Jul 25 02:34:09 2013 -0500
+++ b/tests/test-merge1.t	Thu Jul 25 02:44:27 2013 -0500
@@ -28,7 +28,7 @@
 
   $ mkdir b
   $ hg up
-  abort: Is a directory: '$TESTTMP/t/b'
+  abort: *: '$TESTTMP/t/b' (glob)
   [255]
   $ hg ci
   abort: last update was interrupted