--- a/tests/test-update-names.t	Tue Oct 24 11:14:38 2017 -0700
+++ b/tests/test-update-names.t	Tue Oct 24 11:15:30 2017 -0700
@@ -50,9 +50,7 @@
   $ hg st
   ? name/file
   $ hg up 1
-  name: untracked directory conflicts with file
-  abort: untracked files in working directory differ from files in requested revision
-  [255]
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 #if symlink