--- a/tests/test-fileset.t Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-fileset.t Fri Oct 09 13:54:52 2015 -0700
@@ -162,9 +162,8 @@
$ fileset 'unresolved()'
$ hg merge
merging b2
- warning: conflicts during merge.
- merging b2 incomplete! (edit conflicts, then use 'hg resolve --mark')
- * files updated, 0 files merged, * files removed, 1 files unresolved (glob)
+ warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
+ 6 files updated, 0 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
$ fileset 'resolved()'