diff tests/test-filebranch.out @ 3331:f472cf9a71af

merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 11 Oct 2006 16:41:52 +0200
parents 966632304dde
children 8feb33c2d153
line wrap: on
line diff
--- a/tests/test-filebranch.out	Wed Oct 11 16:35:09 2006 +0200
+++ b/tests/test-filebranch.out	Wed Oct 11 16:41:52 2006 +0200
@@ -19,7 +19,6 @@
 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