diff --git a/tests/test-filebranch.out b/tests/test-filebranch.out
--- 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