# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1374738267 18000
# Node ID 3ac1735a2265a1f0d0f5ea47a5e428e09c8b581d
# Parent  e012a20061ed50d2c8e9fc6553c89381d928ca65
tests: glob out exception type for directory collision

Got three different results on buildbot.

diff -r e012a20061ed -r 3ac1735a2265 tests/test-merge1.t
--- 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