changeset 3321 | b7a46cbf3f59 |
parent 3317 | 966632304dde |
child 3407 | d2b55e3c4e25 |
--- a/tests/test-merge-revert.out +++ b/tests/test-merge-revert.out @@ -11,7 +11,6 @@ 1 files updated, 0 files merged, 0 files ? 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