Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-fileset.t
changeset 26953 2da6a2dbfc42
parent 26614 ef1eb6df7071
child 27024 ceef5fb14872 
--- a/tests/test-fileset.t	Mon Nov 09 13:12:35 2015 -0500
+++ b/tests/test-fileset.t	Mon Nov 09 17:20:50 2015 -0500
@@ -163,7 +163,7 @@
   $ hg merge
   merging b2
   warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
-  6 files updated, 0 files merged, 1 files removed, 1 files unresolved
+  * files updated, 0 files merged, 1 files removed, 1 files unresolved (glob)
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ fileset 'resolved()'
mercurial