diff -r 7e1baad90121 -r 2b955fec91e0 tests/test-casecollision-merge.t
--- a/tests/test-casecollision-merge.t	Tue Oct 13 00:16:25 2015 +0200
+++ b/tests/test-casecollision-merge.t	Tue Oct 13 00:16:25 2015 +0200
@@ -212,7 +212,7 @@
   $ hg ci -Aqm1
 
   $ hg merge 0
-  abort: Not a directory: '$TESTTMP/directory-casing/aA/a'
+  abort: case-folding collision between Aa and directory of aA/a
   [255]
 (note: no collision between 0 and 00 or 000/f)