--- a/tests/test-pathconflicts-merge.t	Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-pathconflicts-merge.t	Sun Dec 10 22:50:57 2017 -0500
@@ -48,7 +48,7 @@
   a/b: path conflict - a file or link has the same name as a directory
   the local file has been renamed to a/b~0ed027b96f31
   resolve manually then use 'hg resolve --mark a/b'
-  moving a/b to a/b~0ed027b96f31 (glob)
+  moving a/b to a/b~0ed027b96f31
   getting a/b/c/d
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon