--- a/tests/test-flags.out
+++ b/tests/test-flags.out
@@ -45,7 +45,6 @@ summary: added a b
resolving manifests
merging a
-resolving a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
pulling from ../test2