--- a/tests/test-rename-merge2.out Sun Dec 30 17:36:49 2007 +0100
+++ b/tests/test-rename-merge2.out Sun Dec 30 17:45:26 2007 +0100
@@ -22,7 +22,7 @@
--------------
M b
a
-C a
+= a
--------------
--------------
@@ -126,7 +126,7 @@
(branch merge, don't forget to commit)
--------------
M b
-C a
+= a
--------------
--------------
@@ -147,8 +147,8 @@
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
-C a
-C b
+= a
+= b
--------------
--------------
@@ -194,7 +194,7 @@
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
-C b
+= b
--------------
--------------
@@ -244,7 +244,7 @@
(branch merge, don't forget to commit)
--------------
M c
-C b
+= b
--------------
--------------
@@ -264,7 +264,7 @@
(branch merge, don't forget to commit)
--------------
M b
-C a
+= a
--------------
--------------
@@ -370,7 +370,7 @@
(branch merge, don't forget to commit)
--------------
M b
-C a
+= a
--------------
--------------
@@ -412,7 +412,7 @@
(branch merge, don't forget to commit)
--------------
M b
-C a
+= a
--------------
--------------