--- a/tests/test-merge1.t	Tue Aug 21 15:25:46 2018 -0400
+++ b/tests/test-merge1.t	Wed Sep 12 23:10:59 2018 -0400
@@ -30,7 +30,7 @@
 
   $ mkdir b && touch b/nonempty
   $ hg up
-  abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !)
+  abort: Unlinking directory not permitted: *$TESTTMP/t/b* (glob) (windows !)
   abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !)
   [255]
   $ hg ci