##// END OF EJS Templates
test-fileset: glob the updated file count for Windows stability...
Matt Harbison -
r26953:2da6a2db default
parent child Browse files
Show More
@@ -163,7 +163,7 Test merge states
163 $ hg merge
163 $ hg merge
164 merging b2
164 merging b2
165 warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
165 warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
166 6 files updated, 0 files merged, 1 files removed, 1 files unresolved
166 * files updated, 0 files merged, 1 files removed, 1 files unresolved (glob)
167 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
167 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
168 [1]
168 [1]
169 $ fileset 'resolved()'
169 $ fileset 'resolved()'
General Comments 0
You need to be logged in to leave comments. Login now