--- a/tests/test-flags.t Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-flags.t Thu Jan 10 00:44:23 2013 +0100
@@ -79,7 +79,7 @@
$ hg -v merge
resolving manifests
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cd ../test3
@@ -128,7 +128,7 @@
$ hg -v merge
resolving manifests
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ ls -l ../test[123]/a > foo