changeset 3317 | 966632304dde |
parent 2973 | fb493241d7f6 |
child 5405 | 8feb33c2d153 |
--- a/tests/test-filebranch.out +++ b/tests/test-filebranch.out @@ -19,7 +19,6 @@ merging for foo resolving manifests getting bar merging foo -resolving foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) we shouldn't have anything but foo in merge state here