--- a/tests/test-mq-merge.t Sat Jun 11 14:14:11 2011 +0200
+++ b/tests/test-mq-merge.t Sat Jun 11 14:14:13 2011 +0200
@@ -130,7 +130,7 @@
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
patch didn't work out, merging patcha
- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
applying patcha2