tests/test-imerge.out

--- a/tests/test-imerge.out	Sun Mar 23 20:37:02 2008 +0100
+++ b/tests/test-imerge.out	Sun Mar 23 20:37:04 2008 +0100
@@ -15,6 +15,12 @@
 U foo (foo2)
 % next
 foo
+% resolve and unresolve
+merging e6da46716401 and 30d266f502e7
+R foo (foo2)
+all conflicts resolved
+merging e6da46716401 and 30d266f502e7
+U foo (foo2)
 % merge next
 merging foo and foo2
 all conflicts resolved