--- a/tests/test-merge1.t Fri Feb 18 03:34:47 2011 +0100
+++ b/tests/test-merge1.t Fri Feb 18 03:35:01 2011 +0100
@@ -72,8 +72,8 @@
[255]
merge of b expected
$ hg merge -f 1
+ merging b
merging for b
- merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg diff --nodates
@@ -153,8 +153,8 @@
[255]
merge of b expected
$ hg merge -f 2
+ merging b
merging for b
- merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg diff --nodates