| changeset 3311 | 966632304dde |
| parent 2175 | b2ae81a7df29 |
| child 3400 | d2b55e3c4e25 |
--- a/tests/test-merge-revert.out Tue Oct 10 01:13:03 2006 -0500 +++ b/tests/test-merge-revert.out Tue Oct 10 01:16:06 2006 -0500 @@ -11,7 +11,6 @@ ? file1.orig 016807e6fdaf tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -merging file1 0 files updated, 1 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip