tests/test-merge-revert.out
changeset 3400 d2b55e3c4e25
parent 3311 966632304dde
child 12156 4c94b6d0fb1c
--- a/tests/test-merge-revert.out	Sun Oct 15 21:09:56 2006 +0200
+++ b/tests/test-merge-revert.out	Sun Oct 15 16:18:09 2006 -0500
@@ -11,7 +11,7 @@
 ? file1.orig
 016807e6fdaf tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
 016807e6fdaf tip
 ? file1.orig