diff -r 0e370798eebf -r 966632304dde tests/test-flags.out
--- a/tests/test-flags.out	Tue Oct 10 01:13:03 2006 -0500
+++ b/tests/test-flags.out	Tue Oct 10 01:16:06 2006 -0500
@@ -44,7 +44,6 @@
 
 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)
 -rwxr-x---