diff -r 33c8a6837181 -r 0217d66846f7 tests/test-merge1.t
--- a/tests/test-merge1.t	Mon Oct 02 14:05:30 2017 -0700
+++ b/tests/test-merge1.t	Mon Oct 02 14:05:30 2017 -0700
@@ -30,7 +30,7 @@
 
   $ mkdir b && touch b/nonempty
   $ hg up
-  b: untracked file differs
+  b: untracked directory conflicts with file
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ hg ci